From 85800a1afa6b44fec0311da12c090cb3ad32a5c4 Mon Sep 17 00:00:00 2001 From: "Douglas E. Warner" Date: Thu, 5 Jul 2007 18:20:32 +0000 Subject: [PATCH] updated lib64 patch for core and grass libraries --- lib64-suffix.patch | 24 ++++++++++++++++++++++++ qgis.spec | 5 ++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/lib64-suffix.patch b/lib64-suffix.patch index 9951f20..6fd9579 100644 --- a/lib64-suffix.patch +++ b/lib64-suffix.patch @@ -40,3 +40,27 @@ diff -ruN qgis-0.8.1-orig/settings.pro qgis-0.8.1/settings.pro 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} diff --git a/qgis.spec b/qgis.spec index b943e21..e25d680 100644 --- a/qgis.spec +++ b/qgis.spec @@ -3,7 +3,7 @@ Summary: A user friendly Open Source Geographic Information System Name: qgis Version: 0.8.1 -Release: 9%{?dist} +Release: 10%{?dist} #Epoch: 1 License: GPL Group: Applications/Engineering @@ -177,6 +177,9 @@ desktop-file-install --vendor="fedora" \ %{_datadir}/%{name}/themes/default/grass %changelog +* Thu Jul 05 2007 Douglas E. Warner 0.8.1-10 +- updated lib64 patch for core and grass libraries + * Thu Jul 05 2007 Douglas E. Warner 0.8.1-9 - updated lib64 patch