rpms/qgis/devel lib64-suffix.patch,1.2,1.3

Douglas E. Warner (silfreed) fedora-extras-commits at redhat.com
Thu Jul 5 17:33:52 UTC 2007


Author: silfreed

Update of /cvs/pkgs/rpms/qgis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23898

Modified Files:
	lib64-suffix.patch 
Log Message:
another try at lib64 patch


lib64-suffix.patch:

Index: lib64-suffix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/lib64-suffix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lib64-suffix.patch	5 Jul 2007 15:46:04 -0000	1.2
+++ lib64-suffix.patch	5 Jul 2007 17:33:46 -0000	1.3
@@ -1,6 +1,18 @@
+diff -ruN qgis-0.8.1-orig/CMakeLists.txt qgis-0.8.1/CMakeLists.txt
+--- qgis-0.8.1-orig/CMakeLists.txt	2007-02-23 12:20:33.000000000 -0500
++++ qgis-0.8.1/CMakeLists.txt	2007-07-05 13:32:55.000000000 -0400
+@@ -140,7 +140,7 @@
+   # common for MAC and UNIX
+   SET (QGIS_BIN_DIR    ${CMAKE_INSTALL_PREFIX}/bin)
+   SET (QGIS_DATA_DIR   ${CMAKE_INSTALL_PREFIX}/share/qgis)
+-  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)
++  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qgis)
+   SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
+   SET (QGIS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
+ 
 diff -ruN qgis-0.8.1-orig/settings.pro qgis-0.8.1/settings.pro
 --- qgis-0.8.1-orig/settings.pro	2007-01-01 23:31:27.000000000 -0500
-+++ qgis-0.8.1/settings.pro	2007-07-05 11:45:38.000000000 -0400
++++ qgis-0.8.1/settings.pro	2007-07-05 13:33:16.000000000 -0400
 @@ -107,14 +107,14 @@
  win32:QGISBINDIR=$${DESTDIR}
  macx:QGISBINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/MacOS/




More information about the fedora-extras-commits mailing list