rpms/qgis/F-7 lib64-suffix.patch,1.1,1.2 qgis.spec,1.2,1.3

[Douglas E. Warner (silfreed)]

Author: silfreed

Update of /cvs/pkgs/rpms/qgis/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7209

Modified Files:
	lib64-suffix.patch qgis.spec 
Log Message:
- updated lib64 patch for core and grass libraries
- updated lib64 patch for plugins
- adding ExcludeArch: ppc64 for bug#247152 (lrelease segfault)


lib64-suffix.patch:

Index: lib64-suffix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-7/lib64-suffix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lib64-suffix.patch	5 Jul 2007 15:16:02 -0000	1.1
+++ lib64-suffix.patch	5 Jul 2007 18:49:02 -0000	1.2
@@ -1,21 +1,33 @@
+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 10:30:08.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/
  
 -linux-g++:QGISLIBDIR=$${DESTDIR}/lib
-+linux-g++:QGISLIBDIR=$${DESTDIR}/lib${LIB_SUFFIX}
++linux-g++:QGISLIBDIR=$${DESTDIR}/lib$${LIB_SUFFIX}
  macx:QGISLIBDIR=$${QGISBINDIR}
  win32:QGISLIBDIR=$${DESTDIR}
  
 -QGISPLUGINDIR=$${DESTDIR}/lib/qgis
-+QGISPLUGINDIR=$${DESTDIR}/lib${LIB_SUFFIX}/qgis
++QGISPLUGINDIR=$${DESTDIR}/lib$${LIB_SUFFIX}/qgis
  macx:QGISPLUGINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
  
 -QGISPROVIDERDIR=$${QGISBINDIR}/lib/qgis
-+QGISPROVIDERDIR=$${QGISBINDIR}/lib${LIB_SUFFIX}/qgis
++QGISPROVIDERDIR=$${QGISBINDIR}/lib$${LIB_SUFFIX}/qgis
  macx:QGISPROVIDERDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
  
  win32:QGISDOCDIR=$${DESTDIR}/share/qgis/doc
@@ -24,7 +36,31 @@
  win32:LIBS+=-L$${DESTDIR}
  win32:LIBS+=-L$${DESTDIR}/lib/qgis
 -linux-g++:LIBS+=-L$${DESTDIR}/lib
-+linux-g++:LIBS+=-L$${DESTDIR}/lib${LIB_SUFFIX}
++linux-g++:LIBS+=-L$${DESTDIR}/lib$${LIB_SUFFIX}
  linux-g++:LIBS+=-L/usr/lib/ccache/lib
  macx:LIBS+=-L$${QGISLIBDIR}
  macx:LIBS+=-F/Library/Frameworks/
+diff -ruN qgis-0.8.1-orig/src/core/CMakeLists.txt qgis-0.8.1/src/core/CMakeLists.txt
+--- qgis-0.8.1-orig/src/core/CMakeLists.txt	2007-04-18 13:46:21.000000000 -0400
++++ qgis-0.8.1/src/core/CMakeLists.txt	2007-07-05 14:18:50.000000000 -0400
+@@ -304,7 +304,7 @@
+ 
+ INSTALL(TARGETS qgis_core
+   RUNTIME DESTINATION ${QGIS_BIN_DIR}
+-  LIBRARY DESTINATION lib)
++  LIBRARY DESTINATION lib${LIB_SUFFIX})
+ 
+ 
+ 
+diff -ruN qgis-0.8.1-orig/src/providers/grass/CMakeLists.txt qgis-0.8.1/src/providers/grass/CMakeLists.txt
+--- qgis-0.8.1-orig/src/providers/grass/CMakeLists.txt	2007-02-12 17:56:43.000000000 -0500
++++ qgis-0.8.1/src/providers/grass/CMakeLists.txt	2007-07-05 14:19:36.000000000 -0400
+@@ -44,7 +44,7 @@
+ 
+ INSTALL(TARGETS qgisgrass
+   RUNTIME DESTINATION ${QGIS_BIN_DIR}
+-  LIBRARY DESTINATION lib)
++  LIBRARY DESTINATION lib${LIB_SUFFIX})
+        
+ INSTALL(TARGETS grassprovider
+   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-7/qgis.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qgis.spec	5 Jul 2007 15:16:02 -0000	1.2
+++ qgis.spec	5 Jul 2007 18:49:02 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: A user friendly Open Source Geographic Information System
 Name: qgis
 Version: 0.8.1
-Release: 7%{?dist}
+Release: 10%{?dist}
 #Epoch: 1
 License: GPL
 Group: Applications/Engineering
@@ -26,6 +26,8 @@
 BuildRequires: sqlite-devel
 # grass package contains definitions needed for configure script
 BuildRequires: grass, grass-devel
+# bug 247152
+ExcludeArch: ppc64
 
 %description
 Quantum GIS (QGIS) is a user friendly Open Source Geographic Information 
@@ -175,6 +177,15 @@
 %{_datadir}/%{name}/themes/default/grass
 
 %changelog
+* Thu Jul 05 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-10
+- updated lib64 patch for core and grass libraries
+
+* Thu Jul 05 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-9
+- updated lib64 patch
+
+* Thu Jul 05 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-8
+- adding ExcludeArch: ppc64 for bug#247152 (lrelease segfault)
+
 * Thu Jul 05 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-7
 - adding patch for lib64 support through lib_suffix