diff --git a/lib64-suffix.patch b/lib64-suffix.patch index 6fd9579..3423deb 100644 --- a/lib64-suffix.patch +++ b/lib64-suffix.patch @@ -52,6 +52,18 @@ diff -ruN qgis-0.8.1-orig/src/core/CMakeLists.txt qgis-0.8.1/src/core/CMakeLists +diff -ruN qgis-0.8.1-orig/src/gui/CMakeLists.txt qgis-0.8.1/src/gui/CMakeLists.txt +--- qgis-0.8.1-orig/src/gui/CMakeLists.txt 2007-02-28 14:18:37.000000000 -0500 ++++ qgis-0.8.1/src/gui/CMakeLists.txt 2007-07-10 11:47:27.000000000 -0400 +@@ -52,7 +52,7 @@ + + # This sets runpath to the installation directory + SET_TARGET_PROPERTIES(qgis PROPERTIES +- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib ++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} + BUILD_WITH_INSTALL_RPATH true + ) + 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 @@ -64,3 +76,15 @@ diff -ruN qgis-0.8.1-orig/src/providers/grass/CMakeLists.txt qgis-0.8.1/src/prov INSTALL(TARGETS grassprovider RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} +diff -ruN qgis-0.8.1-orig/tools/mapserver_export/CMakeLists.txt qgis-0.8.1/tools/mapserver_export/CMakeLists.txt +--- qgis-0.8.1-orig/tools/mapserver_export/CMakeLists.txt 2007-02-26 14:55:59.000000000 -0500 ++++ qgis-0.8.1/tools/mapserver_export/CMakeLists.txt 2007-07-10 11:49:32.000000000 -0400 +@@ -31,7 +31,7 @@ + + # This sets runpath to the installation directory + SET_TARGET_PROPERTIES(msexport PROPERTIES +- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib ++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} + BUILD_WITH_INSTALL_RPATH true + ) + diff --git a/qgis.spec b/qgis.spec index e25d680..d30b766 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: 10%{?dist} +Release: 11%{?dist} #Epoch: 1 License: GPL Group: Applications/Engineering @@ -91,11 +91,12 @@ find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';' %{__chmod} -x ./src/legend/qgslegend.h %{__chmod} -x ./src/legend/qgslegend.cpp -# remove doc because it gets packaged by %doc -%{__rm} -rf %{buildroot}/%{_datadir}/%{name}/doc +# remove files packaged by doc +%{__rm} -f %{buildroot}/%{_datadir}/doc/AUTHORS \ + %{buildroot}/%{_datadir}/doc/SPONSORS # remove .cvsignore files -find . -name '.cvsignore' -exec %{__rm} -f {} ';' +#find . -name '.cvsignore' -exec %{__rm} -f {} ';' # fix non-executable file #%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py @@ -125,7 +126,7 @@ desktop-file-install --vendor="fedora" \ %files %defattr(-, root, root, -) -%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS TODO CONTRIBUTORS doc/* +%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS TODO CONTRIBUTORS %{_bindir}/%{name} %{_bindir}/%{name}_help #%{_bindir}/msexport @@ -148,6 +149,7 @@ desktop-file-install --vendor="fedora" \ %{_libdir}/%{name}/libwfsplugin.so %{_libdir}/%{name}/libwfsprovider.so %{_libdir}/%{name}/libwmsprovider.so +%{_datadir}/%{name}/doc %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/fedora-%{name}.desktop %dir %{_datadir}/%{name} @@ -177,6 +179,11 @@ desktop-file-install --vendor="fedora" \ %{_datadir}/%{name}/themes/default/grass %changelog +* Tue Jul 10 2007 Douglas E. Warner 0.8.1-11 +- allowing docs to be installed by qgis so they can be referenced by internal + help system (bug#241403) +- updated lib64 patch (bug#247549) to try to get plugins found on x86_64 + * Thu Jul 05 2007 Douglas E. Warner 0.8.1-10 - updated lib64 patch for core and grass libraries