rpms/qgis/devel lib64-suffix.patch,1.4,1.5 qgis.spec,1.5,1.6

Douglas E. Warner (silfreed) fedora-extras-commits at redhat.com
Tue Jul 10 18:22:37 UTC 2007


Author: silfreed

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

Modified Files:
	lib64-suffix.patch qgis.spec 
Log Message:
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



lib64-suffix.patch:

Index: lib64-suffix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/lib64-suffix.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lib64-suffix.patch	5 Jul 2007 18:20:32 -0000	1.4
+++ lib64-suffix.patch	10 Jul 2007 18:22:34 -0000	1.5
@@ -52,6 +52,18 @@
  
  
  
+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 @@
         
  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
+ )
+ 


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/qgis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qgis.spec	5 Jul 2007 18:20:32 -0000	1.5
+++ qgis.spec	10 Jul 2007 18:22:34 -0000	1.6
@@ -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 @@
 %{__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 @@
 
 %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 @@
 %{_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 @@
 %{_datadir}/%{name}/themes/default/grass
 
 %changelog
+* Tue Jul 10 2007 Douglas E. Warner <silfreed at silfreed.net> 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 <silfreed at silfreed.net> 0.8.1-10
 - updated lib64 patch for core and grass libraries
 




More information about the fedora-extras-commits mailing list