New upstream release 2.4.0

.gitignore

@@ -9,3 +9,4 @@ qgis_1.5.0.tar.gz
 /qgis-2.0.0.tar.bz2
 /qgis-2.0.1.tar.bz2
 /qgis-2.2.0.tar.bz2
+/qgis-2.4.0.tar.bz2

qgis-1.5.0-grass.patch

@@ -1,11 +0,0 @@
---- qgis-1.5.0/cmake/FindGRASS.cmake	2010-06-20 19:09:21.151964000 +0200
-+++ qgis-1.5.0-grass/cmake/FindGRASS.cmake	2010-07-12 09:31:16.551002521 +0200
-@@ -17,7 +17,7 @@
-     MARK_AS_ADVANCED ( GRASS_LIBRARY_${LIB} )
- 
-     SET(LIB_PATH NOTFOUND)
--    FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib NO_DEFAULT_PATH)
-+    FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib)
- 
-     IF (LIB_PATH)
-       SET (GRASS_LIBRARY_${LIB} ${LIB_PATH})

qgis-2.2.0-arm-build.patch

@@ -1,227 +0,0 @@
-From 03b028dbf7c66949a1365cb6a927874c1318840e Mon Sep 17 00:00:00 2001
-From: Bas Couwenberg <sebastic@xs4all.nl>
-Date: Fri, 28 Mar 2014 10:37:13 +0100
-Subject: [PATCH 1/3] On armel/armhf qreal is typedef'ed to float not double.
-
-This patch adds qreal versions of some functions on arm. It was originally
-writen by Konstantinos Margaritis and later fixed by Peter Michael Green.
-
-Bug-Debian: http://bugs.debian.org/691333
----
- src/core/qgscoordinatetransform.cpp | 11 +++++++++++
- src/core/qgscoordinatetransform.h   |  3 +++
- src/core/qgsmaptopixel.cpp          |  9 +++++++++
- src/core/qgsmaptopixel.h            |  3 +++
- 4 files changed, 26 insertions(+)
-
-diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
-index 42427f9..58fb557 100644
---- a/src/core/qgscoordinatetransform.cpp
-+++ b/src/core/qgscoordinatetransform.cpp
-@@ -434,6 +434,17 @@ void QgsCoordinateTransform::transformInPlace(
-   }
- }
- 
-+#ifdef QT_ARCH_ARM
-+void QgsCoordinateTransform::transformInPlace( qreal& x, qreal& y, double& z,
-+    TransformDirection direction ) const
-+{
-+  double xd = (double) x, yd = (double) y;
-+  transformInPlace(xd, yd, z, direction);
-+  x=xd;
-+  y=yd;
-+}
-+#endif
-+
- #ifdef ANDROID
- void QgsCoordinateTransform::transformInPlace( float& x, float& y, float& z,
-     TransformDirection direction ) const
-diff --git a/src/core/qgscoordinatetransform.h b/src/core/qgscoordinatetransform.h
-index df9c314..20bb04a 100644
---- a/src/core/qgscoordinatetransform.h
-+++ b/src/core/qgscoordinatetransform.h
-@@ -156,6 +156,9 @@ class CORE_EXPORT QgsCoordinateTransform : public QObject
-     // and y variables in place. The second one works with good old-fashioned
-     // C style arrays.
-     void transformInPlace( double& x, double& y, double &z, TransformDirection direction = ForwardTransform ) const;
-+#ifdef QT_ARCH_ARM
-+    void transformInPlace( qreal& x, qreal& y, double &z, TransformDirection direction = ForwardTransform ) const;
-+#endif
- 
-     //! @note not available in python bindings
-     void transformInPlace( QVector<double>& x, QVector<double>& y, QVector<double>& z,
-diff --git a/src/core/qgsmaptopixel.cpp b/src/core/qgsmaptopixel.cpp
-index 6dff6f1..fab4848 100644
---- a/src/core/qgsmaptopixel.cpp
-+++ b/src/core/qgsmaptopixel.cpp
-@@ -138,6 +138,14 @@ void QgsMapToPixel::transformInPlace( double& x, double& y ) const
-   y = yMax - ( y - yMin ) / mMapUnitsPerPixel;
- }
- 
-+#ifdef QT_ARCH_ARM
-+void QgsMapToPixel::transformInPlace( qreal& x, qreal& y ) const
-+{
-+  x = ( x - xMin ) / mMapUnitsPerPixel;
-+  y = yMax - ( y - yMin ) / mMapUnitsPerPixel;
-+}
-+#endif
-+
- void QgsMapToPixel::transformInPlace( QVector<double>& x,
-                                       QVector<double>& y ) const
- {
-@@ -161,3 +169,4 @@ void QgsMapToPixel::transformInPlace( QVector<float>& x,
-     transformInPlace( x[i], y[i] );
- }
- #endif
-+
-diff --git a/src/core/qgsmaptopixel.h b/src/core/qgsmaptopixel.h
-index fb3c317..8377282 100644
---- a/src/core/qgsmaptopixel.h
-+++ b/src/core/qgsmaptopixel.h
-@@ -66,6 +66,9 @@ class CORE_EXPORT QgsMapToPixel
-        given coordinates in place. Intended as a fast way to do the
-        transform. */
-     void transformInPlace( double& x, double& y ) const;
-+#ifdef QT_ARCH_ARM
-+    void transformInPlace( qreal& x, qreal& y ) const;
-+#endif
- 
-     /* Transform device coordinates to map coordinates. Modifies the
-        given coordinates in place. Intended as a fast way to do the
--- 
-1.8.5.5
-
-
-From 7db6ae54124a2f2213c0609490904653c6c798af Mon Sep 17 00:00:00 2001
-From: Bas Couwenberg <sebastic@xs4all.nl>
-Date: Fri, 28 Mar 2014 10:39:35 +0100
-Subject: [PATCH 2/3] Fix qreal vs double.
-
-In qt4 on arm architectures qreal is defined as float while on other
-architectures it is defined as double. This can cause problems if qreal
-and double are carelessly mixed.
-
-In this particular case the problem is that qMin/qMax are templates defined
-to take two parameters of the same type. If two different types are passed
-in then C++ can't resolve what type the template parameter should be and
-bails out. The fix is simple, typecast one of the parameters so they
-match.
-
-Author: Peter Michael Green <plugwash@debian.org>
-Bug-Debian: http://bugs.debian.org/737814
----
- src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp  | 2 +-
- src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp b/src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp
-index d63206a..7c18777 100644
---- a/src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp
-+++ b/src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp
-@@ -433,7 +433,7 @@ void QwtPolarCurve::drawLines( QPainter *painter,
- 
-     if ( !clipRect.isEmpty() )
-     {
--        double off = qCeil( qMax( 1.0, painter->pen().widthF() ) );
-+        double off = qCeil( qMax((qreal)1.0,painter->pen().widthF() ) );
-         clipRect = clipRect.toRect().adjusted( -off, -off, off, off );
-         polyline = QwtClipper::clipPolygonF( clipRect, polyline );
-     }
-diff --git a/src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp b/src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp
-index 1db2379..b4a43b0 100644
---- a/src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp
-+++ b/src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp
-@@ -278,7 +278,7 @@ QRectF QwtPolarLayout::layoutLegend( Options options, QRectF &rect ) const
-         // We don't allow vertical legends to take more than
-         // half of the available space.
- 
--        dim = qMin( hint.width(), rect.width() * d_data->legendRatio );
-+        dim = qMin( hint.width(), (qreal)(rect.width() * d_data->legendRatio) );
- 
-         if ( !( options & IgnoreScrollbars ) )
-         {
-@@ -293,7 +293,7 @@ QRectF QwtPolarLayout::layoutLegend( Options options, QRectF &rect ) const
-     }
-     else
-     {
--        dim = qMin( hint.height(), rect.height() * d_data->legendRatio );
-+        dim = qMin( hint.height(), (qreal)(rect.height() * d_data->legendRatio) );
-         dim = qMax( dim, d_data->layoutData.legend.hScrollBarHeight );
-     }
- 
--- 
-1.8.5.5
-
-
-From 3d44c5934aba0c4a1e0919549f50f1650140de57 Mon Sep 17 00:00:00 2001
-From: Bas Couwenberg <sebastic@xs4all.nl>
-Date: Fri, 28 Mar 2014 10:41:22 +0100
-Subject: [PATCH 3/3] Disable features on ARM.
-
-Building QGIS on ARM produces the error:
-
-sip: qgis/python/core/qgsclipper.sip:44: \
-QgsClipper::trimFeature() unsupported function argument type - provide %MethodCode and a C++ signature
-
-For the Android builds this was fixed in commit 2cc684793ceb29d8600d71564fb38f92c998f588.
-
-This patch adapts the Android fix, by disabling the SIP features on all ARM systems.
-
-Bug-Debian: http://bugs.debian.org/737814
----
- python/CMakeLists.txt                        | 5 +++++
- python/core/composer/qgscomposerscalebar.sip | 2 +-
- python/core/qgsclipper.sip                   | 4 +++-
- 3 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
-index 044f65e..158e4fa 100644
---- a/python/CMakeLists.txt
-+++ b/python/CMakeLists.txt
-@@ -55,6 +55,11 @@ IF(NOT ANDROID)
-   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ANDROID)
- ENDIF(NOT ANDROID)
- 
-+IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
-+ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
-+  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ARM)
-+ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
-+
- IF(NOT WITH_TOUCH)
-   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_TOUCH)
- ENDIF(NOT WITH_TOUCH)
-diff --git a/python/core/composer/qgscomposerscalebar.sip b/python/core/composer/qgscomposerscalebar.sip
-index 727c10f..9a0e034 100644
---- a/python/core/composer/qgscomposerscalebar.sip
-+++ b/python/core/composer/qgscomposerscalebar.sip
-@@ -109,7 +109,7 @@ class QgsComposerScaleBar: QgsComposerItem
-      of the segment
-      @note python bindings not available on android
-      */
--%If (!ANDROID)
-+%If (!ARM)
-     void segmentPositions( QList<QPair<double, double> >& posWidthList ) const;
- %End
- 
-diff --git a/python/core/qgsclipper.sip b/python/core/qgsclipper.sip
-index 847123c..90c920b 100644
---- a/python/core/qgsclipper.sip
-+++ b/python/core/qgsclipper.sip
-@@ -1,3 +1,5 @@
-+%Feature ARM
-+
- class QgsClipper
- {
- %TypeHeaderCode
-@@ -34,7 +36,7 @@ class QgsClipper
-     // A handy way to refer to the four boundaries
-     enum Boundary {XMax, XMin, YMax, YMin};
- 
--%If (!ANDROID)
-+%If (!ARM)
-     // Trims the given feature to a rectangular box. Returns the trimmed
-     // feature in x and y. The shapeOpen parameter determines whether
-     // the function treats the points as a closed shape (polygon), or as
--- 
-1.8.5.5
-

qgis-2.2.0-httplib2.patch

@@ -1,24 +0,0 @@
-diff -Nur qgis-2.2.0/python/plugins/processing/admintools/CMakeLists.txt qgis-2.2.0-httplib2/python/plugins/processing/admintools/CMakeLists.txt
---- qgis-2.2.0/python/plugins/processing/admintools/CMakeLists.txt	2014-02-22 09:48:47.000000000 +0100
-+++ qgis-2.2.0-httplib2/python/plugins/processing/admintools/CMakeLists.txt	2014-02-22 20:37:24.158591564 +0100
-@@ -1,6 +1,5 @@
- FILE(GLOB PY_FILES *.py)
- 
- ADD_SUBDIRECTORY(geoserver)
--ADD_SUBDIRECTORY(httplib2)
- 
--PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
-\ No newline at end of file
-+PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
-diff -Nur qgis-2.2.0/python/plugins/processing/admintools/geoserver/catalog.py qgis-2.2.0-httplib2/python/plugins/processing/admintools/geoserver/catalog.py
---- qgis-2.2.0/python/plugins/processing/admintools/geoserver/catalog.py	2014-02-22 09:48:47.000000000 +0100
-+++ qgis-2.2.0-httplib2/python/plugins/processing/admintools/geoserver/catalog.py	2014-02-22 20:36:11.366380941 +0100
-@@ -41,7 +41,7 @@
-     UnsavedLayerGroup
- from processing.admintools.geoserver.workspace import workspace_from_index, \
-     Workspace
--from processing.admintools import httplib2
-+import httplib2
- 
- 
- logger = logging.getLogger('gsconfig.catalog')

qgis-2.2.0-show-license.patch

@@ -1,25 +0,0 @@
-From afd667420a42cb257c6c4524290091663e21f3d6 Mon Sep 17 00:00:00 2001
-From: "Juergen E. Fischer" <jef@norbit.de>
-Date: Wed, 26 Feb 2014 00:17:54 +0100
-Subject: [PATCH] fix license display
-
----
- src/core/qgsapplication.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
-index 691bd72..1efd46d 100644
---- a/src/core/qgsapplication.cpp
-+++ b/src/core/qgsapplication.cpp
-@@ -443,7 +443,7 @@ const QString QgsApplication::translatorsFilePath()
- */
- const QString QgsApplication::licenceFilePath()
- {
--  return ABISYM( mPkgDataPath ) + QString( "/doc/LICENCE" );
-+  return ABISYM( mPkgDataPath ) + QString( "/doc/LICENSE" );
- }
- 
- /*!
--- 
-1.8.5.5
-

qgis-2.4.0-grass.patch

@@ -0,0 +1,13 @@
+diff --git a/cmake/FindGRASS.cmake b/cmake/FindGRASS.cmake
+index 3435a12..2476743 100644
+--- a/cmake/FindGRASS.cmake
++++ b/cmake/FindGRASS.cmake
+@@ -36,7 +36,7 @@ MACRO (CHECK_GRASS G_PREFIX)
+       MARK_AS_ADVANCED ( GRASS_LIBRARY_${LIB} )
+ 
+       SET(LIB_PATH NOTFOUND)
+-      FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib NO_DEFAULT_PATH)
++      FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib)
+ 
+       IF (LIB_PATH)
+         SET (GRASS_LIBRARY_${LIB} ${LIB_PATH})

qgis-2.4.0-sip.patch

@@ -0,0 +1,38 @@
+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
+index 0c94c94..772494a 100644
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -128,7 +128,7 @@ ENDIF(PYQT4_VERSION_NUM LESS 264196)
+ # core module
+ FILE(GLOB_RECURSE sip_files_core core/*.sip)
+ SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
+-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.core.api)
++SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.core.api)
+ ADD_SIP_PYTHON_MODULE(qgis._core core/core.sip qgis_core)
+ 
+ # additional gui includes
+@@ -143,7 +143,7 @@ INCLUDE_DIRECTORIES(
+ # gui module
+ FILE(GLOB_RECURSE sip_files_gui gui/*.sip)
+ SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui})
+-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
++SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)
+ 
+ IF(UNIX AND NOT SIP_VERSION_NUM LESS 265984)
+   SET(SIP_EXTRA_OPTIONS -P ${SIP_EXTRA_OPTIONS})
+@@ -172,13 +172,13 @@ FILE(GLOB sip_files_analysis
+   analysis/interpolation/*.sip
+ )
+ SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis})
+-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api)
++SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api)
+ ADD_SIP_PYTHON_MODULE(qgis._analysis analysis/analysis.sip qgis_core qgis_analysis)
+ 
+ # network-analysis module
+ FILE(GLOB_RECURSE sip_files_network_analysis analysis/network/*.sip)
+ SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_network_analysis})
+-SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.networkanalysis.api)
++SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.networkanalysis.api)
+ ADD_SIP_PYTHON_MODULE(qgis._networkanalysis analysis/network/networkanalysis.sip qgis_core qgis_networkanalysis)
+ 
+ SET(QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis)

qgis.spec

@@ -1,5 +1,3 @@
-# Shebangs in Python plugin files
-# https://hub.qgis.org/issues/9669
 # Shared lib calls exit
 # https://hub.qgis.org/issues/2854
 
@@ -18,8 +16,8 @@
 #TODO: Run test suite (see debian/rules)
 
 Name:           qgis
-Version:        2.2.0
+Version:        2.4.0
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 Group:          Applications/Engineering
 
@@ -40,21 +38,10 @@ Source4:        %{name}-mapserver-README.fedora
 Source5:        %{name}-mime.xml
 
 # Fix detection problem for GRASS libraries
-Patch0: %{name}-1.5.0-grass.patch
+Patch0:         %{name}-2.4.0-grass.patch
-
-# Remove httplib2 from the build system
-# http://hub.qgis.org/issues/9618
-Patch2: %{name}-2.2.0-httplib2.patch
 
 # Drop -o option from SIP, as versions older than 4.10 don't have it
-Patch3: %{name}-2.2.0-sip.patch
+Patch1:         %{name}-2.4.0-sip.patch
-
-# Show license file from frontend
-# https://github.com/qgis/QGIS/commit/afd667420a42cb257c6c4524290091663e21f3d6
-Patch4: %{name}-2.2.0-show-license.patch
-
-# https://github.com/qgis/QGIS/pull/1275.patch
-Patch5: %{name}-2.2.0-arm-build.patch
 
 # Some plug-ins need Pyspatialite (bundled)
 # The license is not totally clear, see:
@@ -63,7 +50,6 @@ Patch5: %{name}-2.2.0-arm-build.patch
 #
 # F20 and up instead allow for loadable sqlite extensions in Python:
 # https://bugzilla.redhat.com/show_bug.cgi?id=1066708
-# https://bugzilla.redhat.com/show_bug.cgi?id=814905
 
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@@ -87,7 +73,7 @@ BuildRequires:  postgresql-devel
 BuildRequires:  proj-devel
 BuildRequires:  PyQt4-devel
 BuildRequires:  PyQwt-devel
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
 BuildRequires:  qextserialport-devel
 BuildRequires:  qscintilla-devel
 BuildRequires:  qt4-devel
@@ -123,7 +109,7 @@ Requires:       gpsbabel
 
 %description
 Geographic Information System (GIS) manages, analyzes, and displays
-databases of geographic information. Quantum GIS (QGIS) supports shape file
+databases of geographic information. QGIS supports shape file
 viewing and editing, spatial data storage with PostgreSQL/PostGIS, projection
 on-the-fly, map composition, and a number of other features via a plugin
 interface. QGIS also supports display of various geo-referenced raster and
@@ -131,15 +117,15 @@ Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid,
 and USGS ASCII DEM.
 
 %package devel
-Summary:        Development Libraries for the Quantum GIS
+Summary:        Development Libraries for the QGIS
 Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
-Development packages for Quantum GIS including the C header files.
+Development packages for QGIS including the C header files.
 
 %package grass 
-Summary:        GRASS Support Libraries for Quantum GIS
+Summary:        GRASS Support Libraries for QGIS
 Group:          Applications/Engineering
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
@@ -152,21 +138,26 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       grass = 6.4.3
   
 %description grass
-GRASS plugin for Quantum GIS required to interface with the GRASS system.
+GRASS plugin for QGIS required to interface with the GRASS system.
 
 %package python 
-Summary:        Python integration and plug-ins for Quantum GIS
+Summary:        Python integration and plug-ins for QGIS
 Group:          Applications/Engineering
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       gdal-python
 Requires:       PyQt4
 Requires:       python-httplib2
+Requires:       python-jinja2
+Requires:       python-matplotlib
+Requires:       python-OWSLib
 Requires:       python-psycopg2
+Requires:       python-pygments
+Requires:       python-six
 Requires:       qscintilla-python
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
 
 %description python
-Python integration and plug-ins for Quantum GIS.
+Python integration and plug-ins for QGIS.
 
 %package mapserver 
 Summary:        FCGI based OGC web map server
@@ -185,10 +176,11 @@ Please refer to %{name}-mapserver-README.fedora for details!
 %prep
 %setup -q
 %patch0 -p1 -b .grass~
-%patch2 -p1 -b .httplib2~
+%patch1 -p1 -b .sip~
-%patch3 -p1 -b .sip~
+
-%patch4 -p1 -b .license~
+# Solved for releases after 2.4.0
-%patch5 -p1 -b .arm-build~
+chmod -x src/gui/qgscolorbutton.cpp src/core/composer/qgscomposershape.h \
+    src/app/qgisapp.h src/gui/qgscolorbutton.h src/gui/qgsmapcanvas.h
 
 # Readme file for QGIS mapserver configuration and Lighttpd example
 install -pm0644 %{SOURCE4} .
@@ -197,12 +189,7 @@ install -pm0644 %{SOURCE4} .
 rm -rf src/core/spatialite
 rm -rf src/core/gps/qwtpolar-{0.1,1.0}
 rm -rf src/core/gps/qextserialport
-rm -rf python/plugins/processing/admintools/httplib2
+rm -rf "python/ext-libs/!(CMakeLists.txt|tests)"
-rm -rf python/pyspatialite
-
-# Remove shebang from processing plug-in files
-# https://hub.qgis.org/issues/9669
-sed -i '1d' python/plugins/processing/saga/{SagaDescriptionCreator.py,SagaHelpGenerator.py}
 
 gzip ChangeLog
 
@@ -222,10 +209,19 @@ gzip ChangeLog
       -D MAPSERVER_SKIP_ECW=TRUE \
       -D GRASS_PREFIX=%{_libdir}/grass \
       -D WITH_MAPSERVER:BOOL=TRUE \
+      -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
       -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
       -D ENABLE_TESTS:BOOL=FALSE \
-      -D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \
+      -D WITH_INTERNAL_DATEUTIL:BOOL=FALSE \
+      -D WITH_INTERNAL_HTTPLIB2:BOOL=FALSE \
+      -D WITH_INTERNAL_JINJA2:BOOL=FALSE \
+      -D WITH_INTERNAL_MARKUPSAFE:BOOL=FALSE \
+      -D WITH_INTERNAL_OWSLIB:BOOL=FALSE \
+      -D WITH_INTERNAL_PYGMENTS:BOOL=FALSE \
+      -D WITH_INTERNAL_PYTZ:BOOL=FALSE \
       -D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \
+      -D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \
+      -D WITH_INTERNAL_SIX:BOOL=FALSE \
       -D WITH_PYSPATIALITE:BOOL=FALSE \
       -D WITH_TOUCH:BOOL=TRUE \
       %{configure_with_spatialite} \
@@ -334,7 +330,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %postun python -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%doc NEWS Exception_to_GPL_for_Qt.txt ChangeLog.gz
+%doc BUGS CODING NEWS Exception_to_GPL_for_Qt.txt ChangeLog.gz
 # QGIS shows the following files in the GUI, including the license text
 %doc %{_datadir}/%{name}/doc/
 %dir %{_datadir}/%{name}/i18n/
@@ -368,18 +364,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %exclude %{_libdir}/%{name}/plugins/libgrassprovider.so
 %exclude %{_libdir}/%{name}/plugins/libgrassrasterprovider.so
 %exclude %{_libdir}/%{name}/plugins/libgrassplugin.so
-%exclude %{_libdir}/%{name}/plugins/libgrass_gis.*.so*
 %exclude %{_libdir}/%{name}/grass/
 
 %files devel
 %{_datadir}/%{name}/FindQGIS.cmake
 %{_includedir}/%{name}/
 %{_libdir}/lib%{name}*.so
+%{?_qt4_plugindir}/designer/libqgis_customwidgets.so*
 
 %files grass
 %{_libdir}/lib%{name}grass.so.*
 %{_libdir}/%{name}/plugins/libgrassprovider.so
-%{_libdir}/%{name}/plugins/libgrass_gis.*.so*
 %{_libdir}/%{name}/plugins/libgrassrasterprovider.so
 %{_libdir}/%{name}/plugins/libgrassplugin.so
 %{_libdir}/%{name}/grass/
@@ -387,8 +382,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files python
 %{_libdir}/libqgispython.so.*
-%{_datadir}/%{name}/python
+%{_datadir}/%{name}/python/
-%{python_sitearch}/%{name}
+%{python_sitearch}/%{name}/
+%{python_sitearch}/PyQt4/uic/widget-plugins/
 
 %files mapserver
 %doc src/mapserver/admin.sld src/mapserver/wms_metadata.xml %{name}-mapserver-README.fedora
@@ -397,6 +393,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Jun 28 2014 Volker Fröhlich <volker27@gmx.at> - 2.4.0-1
+- New upstream release, drop obsolete patches, update remaining
+- Remove references to "Quantum"
+- Add CODING and BUGS file
+- Add necessary direct Python module dependencies
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

sources

@@ -1 +1 @@
-0390e50c8a38c6cbef1720fc11aeabe6  qgis-2.2.0.tar.bz2
+c509ae14d34bf35456ee95c71b909172  qgis-2.4.0.tar.bz2