From fc322ff7e131ea13de09882f1fb1b06edc9df23c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Tue, 23 Aug 2016 21:23:48 +0200 Subject: [PATCH] Update to release 2.16.1 --- .gitignore | 1 + qgis-2.16.0-build.patch | 45 ----------------------------------------- qgis.spec | 8 ++++---- sources | 2 +- 4 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 qgis-2.16.0-build.patch diff --git a/.gitignore b/.gitignore index 544b0e1..a13d1dc 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ qgis_1.5.0.tar.gz /qgis-2.14.1.tar.bz2 /qgis-2.14.3.tar.bz2 /qgis-2.16.0.tar.bz2 +/qgis-2.16.1.tar.bz2 diff --git a/qgis-2.16.0-build.patch b/qgis-2.16.0-build.patch deleted file mode 100644 index e1d74e2..0000000 --- a/qgis-2.16.0-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1cff3b57f023b90513f00e44a03b2f1340ac8ff1 Mon Sep 17 00:00:00 2001 -From: Matthias Kuhn -Date: Tue, 12 Jul 2016 11:37:37 +0200 -Subject: [PATCH] Fix single process build - -A race condition triggered that sometimes the file -output/python/qgis/__init__.py was not created before a python uic -compiler started and therefore the required module could not be -imported. - -This leads to errors like - -[ 82%] Generating ui_dialogAbout.py -Traceback (most recent call last): - File "../../../../../scripts/pyuic-wrapper.py", line 26, in - import qgis.PyQt.uic.pyuic -ImportError: No module named qgis.PyQt.uic.pyuic -python/plugins/GdalTools/tools/CMakeFiles/zzz-GdalTools-2-depend.dir/build.make:117: -recipe for target 'python/plugins/GdalTools/tools/ui_dialogAbout.py' -failed -make[2]: *** [python/plugins/GdalTools/tools/ui_dialogAbout.py] Error 1 -CMakeFiles/Makefile2:5074: recipe for target -'python/plugins/GdalTools/tools/CMakeFiles/zzz-GdalTools-2-depend.dir/all' -failed -make[1]: *** -[python/plugins/GdalTools/tools/CMakeFiles/zzz-GdalTools-2-depend.dir/all] -Error 2 -Makefile:160: recipe for target 'all' failed -make: *** [all] Error 2 ---- - python/PyQt/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/python/PyQt/CMakeLists.txt b/python/PyQt/CMakeLists.txt -index 80fe79c..1520079 100644 ---- a/python/PyQt/CMakeLists.txt -+++ b/python/PyQt/CMakeLists.txt -@@ -21,6 +21,7 @@ SET(PYQT_COMPAT_FILES - ) - - ADD_CUSTOM_TARGET(pyqtcompat ALL) -+ADD_DEPENDENCIES(pyqtcompat pyutils) - - IF(ENABLE_QT5) - SET(PYQT_PREFIX PyQt5) diff --git a/qgis.spec b/qgis.spec index 111655c..5020a4f 100644 --- a/qgis.spec +++ b/qgis.spec @@ -28,7 +28,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.16.0 +Version: 2.16.1 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -49,8 +49,6 @@ Source4: %{name}-server-README.fedora # Based on debian/qgis.xml but excluding already defined or proprietary types Source5: %{name}-mime.xml -Patch0: %{name}-2.16.0-build.patch - # Some plug-ins need Pyspatialite (bundled) # The license is not totally clear, see: # http://code.google.com/p/pyspatialite/issues/detail?id=3 @@ -188,7 +186,6 @@ Please refer to %{name}-server-README.fedora for details! %prep %setup -q -%patch0 -p1 # Remove executable permissions from source code files find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ @@ -418,6 +415,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Tue Aug 23 2016 Daniele ViganĂ² - 2.16.1-1 +- New upstream release + * Thu Aug 11 2016 Volker Froehlich - 2.14.3-5 - Replace dependency on PyQt4 with PyQt4-webkit, since webkit is in a sub-package now (BZ #1360485) diff --git a/sources b/sources index 220467b..722e4a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -33547fe3a0a0a87de209702a9bb60fcc qgis-2.16.0.tar.bz2 +78d17e670e22825374e3f829fc120f45 qgis-2.16.1.tar.bz2