[qgis] New upstream release 2.4.0
Volker Fröhlich
volter at fedoraproject.org
Fri Jul 4 08:23:34 UTC 2014
commit f8ba2f8c4b618c5dd8cce390bade388ca9d82efe
Author: Volker Fröhlich <volker27 at gmx.at>
Date: Fri Jul 4 10:23:23 2014 +0200
New upstream release 2.4.0
.gitignore | 1 +
qgis-1.5.0-grass.patch | 11 --
qgis-2.2.0-arm-build.patch | 227 -----------------------------------------
qgis-2.2.0-httplib2.patch | 24 -----
qgis-2.2.0-show-license.patch | 25 -----
qgis-2.4.0-grass.patch | 13 +++
qgis-2.4.0-sip.patch | 38 +++++++
qgis.spec | 86 ++++++++--------
sources | 2 +-
9 files changed, 97 insertions(+), 330 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f83d57b..4e8dd1f 100644
--- a/.gitignore
+++ b/.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
diff --git a/qgis-2.4.0-grass.patch b/qgis-2.4.0-grass.patch
new file mode 100644
index 0000000..0535dad
--- /dev/null
+++ b/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})
diff --git a/qgis-2.4.0-sip.patch b/qgis-2.4.0-sip.patch
new file mode 100644
index 0000000..68e9093
--- /dev/null
+++ b/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)
diff --git a/qgis.spec b/qgis.spec
index cfa301a..06f4873 100644
--- a/qgis.spec
+++ b/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
-Release: 4%{?dist}
+Version: 2.4.0
+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
-
-# Remove httplib2 from the build system
-# http://hub.qgis.org/issues/9618
-Patch2: %{name}-2.2.0-httplib2.patch
+Patch0: %{name}-2.4.0-grass.patch
# Drop -o option from SIP, as versions older than 4.10 don't have it
-Patch3: %{name}-2.2.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
+Patch1: %{name}-2.4.0-sip.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~
-%patch3 -p1 -b .sip~
-%patch4 -p1 -b .license~
-%patch5 -p1 -b .arm-build~
+%patch1 -p1 -b .sip~
+
+# Solved for releases after 2.4.0
+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/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}
+rm -rf "python/ext-libs/!(CMakeLists.txt|tests)"
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
-%{python_sitearch}/%{name}
+%{_datadir}/%{name}/python/
+%{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 at 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 at lists.fedoraproject.org> - 2.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index aaedb5a..7b3bba8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0390e50c8a38c6cbef1720fc11aeabe6 qgis-2.2.0.tar.bz2
+c509ae14d34bf35456ee95c71b909172 qgis-2.4.0.tar.bz2
More information about the scm-commits
mailing list