diff --git a/.gitignore b/.gitignore index 4741bb3..97c2a5a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /qgis-2.18.22.tar.bz2 /qgis-2.18.23.tar.bz2 /qgis-2.18.24.tar.bz2 +/qgis-2.18.25.tar.bz2 +/qgis-2.18.27.tar.bz2 diff --git a/qgis-2.18.20-grass.patch b/qgis-2.18.20-grass.patch new file mode 100644 index 0000000..115186c --- /dev/null +++ b/qgis-2.18.20-grass.patch @@ -0,0 +1,45 @@ +diff -rupN qgis-2.18.20/src/plugins/grass/scripts/db.connect-login.pg.py qgis-2.18.20-new/src/plugins/grass/scripts/db.connect-login.pg.py +--- qgis-2.18.20/src/plugins/grass/scripts/db.connect-login.pg.py 2018-05-18 14:01:08.000000000 +0200 ++++ qgis-2.18.20-new/src/plugins/grass/scripts/db.connect-login.pg.py 2018-11-02 13:24:02.276460662 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + """ +diff -rupN qgis-2.18.20/src/plugins/grass/scripts/qgis.v.kernel.rast.py qgis-2.18.20-new/src/plugins/grass/scripts/qgis.v.kernel.rast.py +--- qgis-2.18.20/src/plugins/grass/scripts/qgis.v.kernel.rast.py 2018-05-18 14:01:08.000000000 +0200 ++++ qgis-2.18.20-new/src/plugins/grass/scripts/qgis.v.kernel.rast.py 2018-11-02 13:24:00.489411796 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + """ +diff -rupN qgis-2.18.20/src/plugins/grass/scripts/qgis.v.upgrade.py qgis-2.18.20-new/src/plugins/grass/scripts/qgis.v.upgrade.py +--- qgis-2.18.20/src/plugins/grass/scripts/qgis.v.upgrade.py 2018-05-18 14:01:08.000000000 +0200 ++++ qgis-2.18.20-new/src/plugins/grass/scripts/qgis.v.upgrade.py 2018-11-02 13:23:58.663361863 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + """ +diff -rupN qgis-2.18.20/src/plugins/grass/scripts/r.external.all.py qgis-2.18.20-new/src/plugins/grass/scripts/r.external.all.py +--- qgis-2.18.20/src/plugins/grass/scripts/r.external.all.py 2018-05-18 14:01:08.000000000 +0200 ++++ qgis-2.18.20-new/src/plugins/grass/scripts/r.external.all.py 2018-11-02 13:23:56.175293827 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + """ +diff -rupN qgis-2.18.20/src/plugins/grass/scripts/v.out.ogr.pg.py qgis-2.18.20-new/src/plugins/grass/scripts/v.out.ogr.pg.py +--- qgis-2.18.20/src/plugins/grass/scripts/v.out.ogr.pg.py 2018-05-18 14:01:08.000000000 +0200 ++++ qgis-2.18.20-new/src/plugins/grass/scripts/v.out.ogr.pg.py 2018-11-02 13:23:54.063236074 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + + """ diff --git a/qgis-2.18.20-sip.patch b/qgis-2.18.20-sip.patch new file mode 100644 index 0000000..4832438 --- /dev/null +++ b/qgis-2.18.20-sip.patch @@ -0,0 +1,48 @@ +diff -rupN qgis-2.18.20/python/PyQt/PyQt4/QtCore.py qgis-2.18.20-new/python/PyQt/PyQt4/QtCore.py +--- qgis-2.18.20/python/PyQt/PyQt4/QtCore.py 2018-05-18 14:01:08.000000000 +0200 ++++ qgis-2.18.20-new/python/PyQt/PyQt4/QtCore.py 2018-11-01 22:07:20.597278848 +0100 +@@ -23,7 +23,7 @@ __copyright__ = '(C) 2015, Matthias Kuhn + # This will get replaced with a git SHA1 when you do a git archive + __revision__ = '$Format:%H$' + +-import sip ++import PyQt4.sip as sip + for api in ["QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", "QVariant"]: + sip.setapi(api, 2) + +diff -rupN qgis-2.18.20/python/PyQt/PyQt4/uic/pyuic.py qgis-2.18.20-new/python/PyQt/PyQt4/uic/pyuic.py +--- qgis-2.18.20/python/PyQt/PyQt4/uic/pyuic.py 2018-05-18 14:01:08.000000000 +0200 ++++ qgis-2.18.20-new/python/PyQt/PyQt4/uic/pyuic.py 2018-11-01 22:07:15.417251277 +0100 +@@ -24,7 +24,7 @@ __copyright__ = '(C) 2016, Jürgen E. Fi + __revision__ = '$Format:%H$' + + +-import sip ++import PyQt4.sip as sip + for api in ["QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", "QVariant"]: + sip.setapi(api, 2) + +diff -rupN qgis-2.18.20/src/python/qgspythonutilsimpl.cpp qgis-2.18.20-new/src/python/qgspythonutilsimpl.cpp +--- qgis-2.18.20/src/python/qgspythonutilsimpl.cpp 2018-05-18 14:01:08.000000000 +0200 ++++ qgis-2.18.20-new/src/python/qgspythonutilsimpl.cpp 2018-11-01 22:07:08.002211865 +0100 +@@ -122,7 +122,7 @@ bool QgsPythonUtilsImpl::checkSystemImpo + runString( "sys.path = [" + newpaths.join( "," ) + "] + sys.path" ); + + // import SIP +- if ( !runString( "import sip", ++ if ( !runString( "import PyQt4.sip as sip", + QObject::tr( "Couldn't load SIP module." ) + '\n' + QObject::tr( "Python support will be disabled." ) ) ) + { + return false; +diff -rupN qgis-2.18.20/tests/src/python/test_qgsmaplayerregistry.py qgis-2.18.20-new/tests/src/python/test_qgsmaplayerregistry.py +--- qgis-2.18.20/tests/src/python/test_qgsmaplayerregistry.py 2018-05-18 14:01:08.000000000 +0200 ++++ qgis-2.18.20-new/tests/src/python/test_qgsmaplayerregistry.py 2018-11-01 22:06:59.632167456 +0100 +@@ -15,7 +15,7 @@ __revision__ = '$Format:%H$' + from qgis.core import QgsMapLayerRegistry, QgsVectorLayer, QgsMapLayer + from qgis.testing import start_app, unittest + from qgis.PyQt.QtCore import QT_VERSION_STR +-import sip ++import PyQt4.sip as sip + + try: + from qgis.PyQt.QtTest import QSignalSpy diff --git a/qgis-lib64.patch b/qgis-lib64.patch index 493fe69..37f9b1b 100644 --- a/qgis-lib64.patch +++ b/qgis-lib64.patch @@ -1,7 +1,6 @@ -diff -up qgis-2.16.2/CMakeLists.txt.lib64 qgis-2.16.2/CMakeLists.txt -diff -up qgis-2.16.2/cmake/PyQtMacros.cmake.lib64 qgis-2.16.2/cmake/PyQtMacros.cmake ---- qgis-2.16.2/cmake/PyQtMacros.cmake.lib64 2016-08-26 05:58:37.000000000 -0600 -+++ qgis-2.16.2/cmake/PyQtMacros.cmake 2016-09-21 16:25:55.921411011 -0600 +diff -rupN qgis-2.18.25/cmake/PyQtMacros.cmake qgis-2.18.25-new/cmake/PyQtMacros.cmake +--- qgis-2.18.25/cmake/PyQtMacros.cmake 2018-10-26 13:59:08.000000000 +0200 ++++ qgis-2.18.25-new/cmake/PyQtMacros.cmake 2018-11-14 00:15:36.247074662 +0100 @@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles ) ELSE(WIN32) # TODO osx diff --git a/qgis.spec b/qgis.spec index 3b524f0..6d9bc0e 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,3 +1,7 @@ +# This package depends on automagic byte compilation +# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 +%global _python_bytecompile_extra 1 + #TODO: Fix error message with processing plug-in in regards to pyspatialite # Shared lib calls exit @@ -20,7 +24,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.25 +Version: 2.18.27 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -43,6 +47,12 @@ Source5: %{name}-mime.xml # https://hub.qgis.org/issues/15602 Patch0: %{name}-lib64.patch +# Fix sip import for namespaced sip +Patch1: %{name}-2.18.20-sip.patch + +# Fix grass scripts shebangs +Patch2: %{name}-2.18.20-grass.patch + # Some plug-ins need Pyspatialite (bundled) # The license is not totally clear, see: # http://code.google.com/p/pyspatialite/issues/detail?id=3 @@ -69,7 +79,7 @@ BuildRequires: libspatialite-devel BuildRequires: libspatialite-devel %endif -BuildRequires: postgresql-devel +BuildRequires: libpq-devel BuildRequires: proj-devel BuildRequires: PyQt4-devel # PyQwt doesn't support qwt6, so just turn it off for now on RHEL @@ -82,8 +92,8 @@ BuildRequires: qca2-devel BuildRequires: qextserialport-devel BuildRequires: qjson-devel BuildRequires: qscintilla-devel -BuildRequires: qscintilla-python -BuildRequires: qscintilla-python2-devel +BuildRequires: python2-qscintilla +BuildRequires: python2-qscintilla-devel BuildRequires: qt4-devel #BuildRequires: qt-mobility-devel BuildRequires: qt4-webkit-devel @@ -106,7 +116,7 @@ Requires: qca-ossl # We don't want to provide private Python extension libs %if (0%{?fedora} || 0%{?rhel} > 6) -%global __provides_exclude_from ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$ +%global __provides_exclude_from ^(%{python2_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$ %endif %if 0%{?rhel} == 6 @@ -154,17 +164,17 @@ Provides: %{name}-python%{?_isa} = %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release} Summary: Python integration and plug-ins for QGIS Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: gdal-python +Requires: python2-gdal Requires: PyQt4-webkit -Requires: python-httplib2 -Requires: python-jinja2 -Requires: python-matplotlib -Requires: python-OWSLib -Requires: python-psycopg2 -Requires: python-pygments -Requires: python-six -Requires: PyYAML -Requires: qscintilla-python +Requires: python2-httplib2 +Requires: python2-jinja2 +Requires: python2-matplotlib +Requires: python2-owslib +Requires: python2-psycopg2 +Requires: python2-pygments +Requires: python2-six +Requires: python2-pyyaml +Requires: python2-qscintilla %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} %description -n python2-qgis @@ -188,6 +198,8 @@ Please refer to %{name}-server-README.fedora for details! %prep %setup -q %patch0 -p1 -b .lib64 +%patch1 -p1 -b .sip +%patch2 -p1 -b .grass # Remove executable permissions from source code files find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ @@ -240,6 +252,7 @@ gzip ChangeLog -D WITH_PYSPATIALITE:BOOL=FALSE \ -D WITH_SERVER:BOOL=TRUE \ -D WITH_TOUCH:BOOL=TRUE \ + -D WITH_INTERNAL_FUTURE=FALSE \ %{configure_with_spatialite} \ . #-D WITH_QTMOBILITY:BOOL=TRUE \ @@ -412,12 +425,24 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog -* Thu Nov 8 2018 Daniele Viganò - 2.18.25-1 +* Mon Dec 24 2018 Daniele Viganò - 2.18.27-1 - New upstream release -* Thu Nov 8 2018 Daniele Viganò - 2.18.24-2 +* Thu Nov 08 2018 Daniele Viganò - 2.18.25-1 +- New upstream release + +* Thu Nov 08 2018 Daniele Viganò - 2.18.24-2 - Sync with upstream +* Sat Nov 03 2018 Sandro Mani - 2.18.20-3 +- Fix broken requires +- Fix build with namespaced SIP +- Fix grass detection +- Fix grass script shebangs + +* Sat Jul 14 2018 Fedora Release Engineering - 2.18.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat Sep 15 2018 Daniele Viganò - 2.18.24-1 - New upstream release diff --git a/sources b/sources index 4f7f0da..d360572 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.24.tar.bz2) = 2783dda3ef0c786c1f0c703482d96cc26a93f6dd75decd550bb49a525fd3ad36bcb4a9cd7ed5988176fba0a7fbd36c6c2ec293ebd63597919f43585a77776942 +SHA512 (qgis-2.18.27.tar.bz2) = e6c9b291165f207d47b7511185527e34d63bcf5f3d603afd43665a9f4e13f8c91f127c47dc8628fc2bec6de138afcb0edb5992600d3621f5e9591668d781563e