rpms/qgis/FC-6 lib64-suffix-0.9.0.patch, NONE, 1.1 man-install-share-0.9.0.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 qgis.spec, 1.5, 1.6 sources, 1.2, 1.3 lib64-suffix.patch, 1.3, NONE man-install-share.patch, 1.1, NONE settings-include-workdir.patch, 1.1, NONE

Thu Sep 27 18:16:53 UTC 2007

Author: silfreed

Update of /cvs/pkgs/rpms/qgis/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14441

Modified Files:
	.cvsignore qgis.spec sources 
Added Files:
	lib64-suffix-0.9.0.patch man-install-share-0.9.0.patch 
Removed Files:
	lib64-suffix.patch man-install-share.patch 
	settings-include-workdir.patch 
Log Message:
* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
- update to 0.9.0
- remove settings-include-workdir.patch
- updated man-install-share.patch to man-install-share-0.9.0.patch
- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
- enabled python to support msexport tool
- added Requires: grass to grass subpackage



lib64-suffix-0.9.0.patch:

--- NEW FILE lib64-suffix-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-27 13:04:41.000000000 -0400
@@ -158,12 +158,13 @@
   # 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_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
   SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 
 
   IF (UNIX AND NOT APPLE)
+    ADD_DEFINITIONS(-DLIB_SUFFIX=\\"${LIB_SUFFIX}\\")
     ADD_DEFINITIONS(-DPREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")
     ADD_DEFINITIONS(-DPLUGINPATH=\\"${QGIS_PLUGIN_DIR}\\")
     ADD_DEFINITIONS(-DPKGDATAPATH=\\"${QGIS_DATA_DIR}\\")
diff -ruN qgis-0.9.0-orig/src/app/CMakeLists.txt qgis-0.9.0/src/app/CMakeLists.txt
--- qgis-0.9.0-orig/src/app/CMakeLists.txt	2007-07-27 12:25:42.000000000 -0400
+++ qgis-0.9.0/src/app/CMakeLists.txt	2007-09-27 12:31:03.000000000 -0400
@@ -225,7 +225,7 @@
 )
 
 SET_TARGET_PROPERTIES(qgis PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
+  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
   INSTALL_RPATH_USE_LINK_PATH true
 )
 
diff -ruN qgis-0.9.0-orig/src/core/CMakeLists.txt qgis-0.9.0/src/core/CMakeLists.txt
--- qgis-0.9.0-orig/src/core/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/core/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -167,7 +167,7 @@
 
 INSTALL(TARGETS qgis_core
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 
 # Added by Tim to install headers
diff -ruN qgis-0.9.0-orig/src/core/qgsapplication.cpp qgis-0.9.0/src/core/qgsapplication.cpp
--- qgis-0.9.0-orig/src/core/qgsapplication.cpp	2007-07-25 16:00:26.000000000 -0400
+++ qgis-0.9.0/src/core/qgsapplication.cpp	2007-09-27 10:35:06.000000000 -0400
@@ -29,6 +29,10 @@
 #include <netinet/in.h>
 #endif
 
+#ifndef LIB_SUFFIX
+#define LIB_SUFFIX ""
+#endif
+
 QString QgsApplication::mPrefixPath;
 QString QgsApplication::mPluginPath;
 QString QgsApplication::mPkgDataPath;
@@ -69,7 +73,7 @@
 	setPluginPath(mPrefixPath + QString("/plugins"));
 	setPkgDataPath(mPrefixPath);
 #else
-    setPluginPath(mPrefixPath + QString("/lib/qgis"));
+    setPluginPath(mPrefixPath + QString("/lib") + LIB_SUFFIX + QString("/qgis"));
     setPkgDataPath(mPrefixPath + QString("/share/qgis"));
 #endif
   }
diff -ruN qgis-0.9.0-orig/src/gui/CMakeLists.txt qgis-0.9.0/src/gui/CMakeLists.txt
--- qgis-0.9.0-orig/src/gui/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
+++ qgis-0.9.0/src/gui/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -79,7 +79,7 @@
 
 INSTALL(TARGETS qgis_gui
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 # for installing headers
 
diff -ruN qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt qgis-0.9.0/src/providers/grass/CMakeLists.txt
--- qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt	2007-07-25 23:20:16.000000000 -0400
+++ qgis-0.9.0/src/providers/grass/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
@@ -49,7 +49,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}

man-install-share-0.9.0.patch:

--- NEW FILE man-install-share-0.9.0.patch ---
diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
+++ qgis-0.9.0/CMakeLists.txt	2007-09-26 08:53:04.000000000 -0400
@@ -241,7 +241,7 @@
 
 # manual page... install also on windows?
 INSTALL (FILES qgis.man
-         DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
 
 
 #############################################################


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2007 15:35:19 -0000	1.2
+++ .cvsignore	27 Sep 2007 18:16:21 -0000	1.3
@@ -1 +1 @@
-qgis-0.8.1.tar.gz
+qgis-0.9.0.tar.gz


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/FC-6/qgis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qgis.spec	2 Aug 2007 18:38:44 -0000	1.5
+++ qgis.spec	27 Sep 2007 18:16:21 -0000	1.6
@@ -2,16 +2,15 @@
 
 Summary: A user friendly Open Source Geographic Information System
 Name: qgis
-Version: 0.8.1
-Release: 12%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 #Epoch: 1
 License: GPLv2+
 Group: Applications/Engineering
 Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
-Patch0: settings-include-workdir.patch
-Patch1: man-install-share.patch
-Patch2: lib64-suffix.patch
+Patch0: man-install-share-0.9.0.patch
+Patch1: lib64-suffix-0.9.0.patch
 URL: http://qgis.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: cmake
@@ -24,6 +23,7 @@
 BuildRequires: gsl-devel
 BuildRequires: postgresql-devel
 BuildRequires: sqlite-devel
+BuildRequires: python-devel
 # grass package contains definitions needed for configure script
 BuildRequires: grass, grass-devel
 # bug 247152
@@ -49,6 +49,7 @@
 Summary: GRASS plugins for qgis
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
+Requires: grass
 
 %description grass
 GRASS plugins for qgis
@@ -65,7 +66,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 for dir in %{_libdir}/grass-*/ ; do
@@ -84,12 +84,12 @@
 make DESTDIR=%{buildroot} install
 
 # remove archives
-find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
-find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
+#find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
 
 # fix spurious executable bits
-%{__chmod} -x ./src/legend/qgslegend.h
-%{__chmod} -x ./src/legend/qgslegend.cpp
+%{__chmod} -x ./src/app/legend/qgslegend.h \
+	./src/app/legend/qgslegend.cpp
 
 # remove files packaged by doc
 %{__rm} -f %{buildroot}/%{_datadir}/doc/AUTHORS \
@@ -99,7 +99,7 @@
 #find . -name '.cvsignore' -exec %{__rm} -f {} ';'
 
 # fix non-executable file
-#%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
+%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
 
 # remove headers
 %{__rm} -rf %{buildroot}/%{_includedir}/%{name}
@@ -126,10 +126,10 @@
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS TODO CONTRIBUTORS
+%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS CONTRIBUTORS
 %{_bindir}/%{name}
 %{_bindir}/%{name}_help
-#%{_bindir}/msexport
+%{_bindir}/msexport
 %{_libdir}/lib%{name}_*.so
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libcopyrightlabelplugin.so
@@ -139,7 +139,6 @@
 %{_libdir}/%{name}/libgpsimporterplugin.so
 %{_libdir}/%{name}/libgpxprovider.so
 %{_libdir}/%{name}/libgridmakerplugin.so
-%{_libdir}/%{name}/liblauncherplugin.so
 %{_libdir}/%{name}/libnortharrowplugin.so
 %{_libdir}/%{name}/libogrprovider.so
 %{_libdir}/%{name}/libpggeoprocessingplugin.so
@@ -155,7 +154,7 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/i18n
 %{_datadir}/%{name}/images
-#%{_datadir}/%{name}/python
+%{_datadir}/%{name}/python
 %{_datadir}/%{name}/resources
 %{_datadir}/%{name}/svg
 %dir %{_datadir}/%{name}/themes
@@ -179,6 +178,17 @@
 %{_datadir}/%{name}/themes/default/grass
 
 %changelog
+* Wed Sep 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-1
+- update to 0.9.0
+- remove settings-include-workdir.patch
+- updated man-install-share.patch to man-install-share-0.9.0.patch
+- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
+- enabled python to support msexport tool
+- added Requires: grass to grass subpackage
+
+* Tue Aug 28 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-13
+- bump for expat 2.0 rebuild bug#195888
+
 * Thu Aug 02 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-12
 - updated License from GPL to GPLv2+
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2007 15:35:19 -0000	1.2
+++ sources	27 Sep 2007 18:16:21 -0000	1.3
@@ -1 +1 @@
-59dca6f6e549a5d28086562f4046820a  qgis-0.8.1.tar.gz
+b3450bfbbe02818aae6b617fab0b86ee  qgis-0.9.0.tar.gz


--- lib64-suffix.patch DELETED ---


--- man-install-share.patch DELETED ---


--- settings-include-workdir.patch DELETED ---


