diff --git a/qgis-2.16.0-build.patch b/qgis-2.16.0-build.patch new file mode 100644 index 0000000..e1d74e2 --- /dev/null +++ b/qgis-2.16.0-build.patch @@ -0,0 +1,45 @@ +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 e3736d5..23f9522 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,13 +15,14 @@ # WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though # the soname might stay the same, it won't work anymore. #http://hub.qgis.org/issues/5274 + %global grass_version 7.0.3 #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.14.3 -Release: 3%{?dist} +Version: 2.16.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -41,6 +42,8 @@ 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 @@ -177,6 +180,7 @@ 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 {} \+ @@ -199,8 +203,8 @@ gzip ChangeLog %build -# Necessary for the test suite -#export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib} +# Necessary to compile python libs +export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/output/%{_lib} #TODO: If for EPEL (osgearth, touch) #Info: TOUCH needs Qt >= 4.5 @@ -242,8 +246,6 @@ make %{?_smp_mflags} %install -# Necessary for the test suite -#export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib} make install DESTDIR=%{buildroot} # Install desktop file without connecting proprietary file types @@ -408,6 +410,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Tue Jul 12 2016 Daniele ViganĂ² - 2.16.0-1 +- New upstream release + * Mon Jun 06 2016 Volker Froehlich - 2.14.3-3 - Grass version in F24 is 7.0.3 for now