Compare commits
No commits in common. "f5435260f5603aabcc6d36531befbbe8132cc1de" and "f5912936860daab0da2bd6805e5d050e3a27f9c1" have entirely different histories.
f5435260f5
...
f591293686
@ -1,13 +0,0 @@
|
|||||||
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})
|
|
@ -57,7 +57,7 @@ BuildRequires: fcgi-devel
|
|||||||
BuildRequires: flex bison
|
BuildRequires: flex bison
|
||||||
BuildRequires: gdal-devel
|
BuildRequires: gdal-devel
|
||||||
BuildRequires: geos-devel
|
BuildRequires: geos-devel
|
||||||
BuildRequires: grass-devel
|
BuildRequires: grass-devel = %{grass_version}
|
||||||
BuildRequires: gsl-devel
|
BuildRequires: gsl-devel
|
||||||
|
|
||||||
%ifarch ppc ppc64
|
%ifarch ppc ppc64
|
||||||
|
Reference in New Issue
Block a user