Fix grass dep. version

Add patch backported from master
2016-09-27 10:40:54 +02:00 · 2016-09-27 10:40:27 +02:00
2 changed files with 14 additions and 1 deletions
--- a/qgis-lib64.patch
+++ b/qgis-lib64.patch
@ -0,0 +1,13 @@
+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
+@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles )
+   ELSE(WIN32)
+     # TODO osx
+     SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
+-    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
+    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
+   ENDIF(WIN32)
+ 
+   FOREACH(it ${ARGN})
--- a/qgis.spec
+++ b/qgis.spec
@ -57,7 +57,7 @@ BuildRequires:  fcgi-devel
 BuildRequires:  flex bison
 BuildRequires:  gdal-devel
 BuildRequires:  geos-devel
-BuildRequires:  grass-devel = %{grass_version}
+BuildRequires:  grass-devel
 BuildRequires:  gsl-devel

 %ifarch ppc ppc64
Author	SHA1	Message	Date
Daniele Viganò	f5435260f5	Fix grass dep. version	2016-09-27 10:40:54 +02:00
Daniele Viganò	65393eec96	Add patch backported from master	2016-09-27 10:40:27 +02:00