rpms/qgis/F-7 python-site-packages-dir-0.9.1.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 qgis.spec, 1.7, 1.8 sources, 1.3, 1.4 lib64-suffix-0.9.0.patch, 1.1, NONE man-install-share-0.9.0.patch, 1.1, NONE

Tue Jan 29 19:08:42 UTC 2008

Author: silfreed

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

Modified Files:
	.cvsignore qgis.spec sources 
Added Files:
	python-site-packages-dir-0.9.1.patch 
Removed Files:
	lib64-suffix-0.9.0.patch man-install-share-0.9.0.patch 
Log Message:
* Mon Jan 28 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.1-2
- defining lib path in build
- installing python bindings globally
- adding patch to determine python site packages dir correctly


python-site-packages-dir-0.9.1.patch:

--- NEW FILE python-site-packages-dir-0.9.1.patch ---
diff -ruN qgis-0.9.1-orig/python/CMakeLists.txt qgis-0.9.1/python/CMakeLists.txt
--- qgis-0.9.1-orig/python/CMakeLists.txt	2007-12-07 08:09:52.000000000 -0500
+++ qgis-0.9.1/python/CMakeLists.txt	2008-01-29 09:21:36.000000000 -0500
@@ -76,11 +76,7 @@
 
 # python's site-packages dir: bindings will be installed here
 IF (UNIX)
-  SET (CMD "
-import sys
-v = sys.version_info
-print sys.exec_prefix + '/lib/python' + str(v[0]) + '.' + str(v[1]) + '/site-packages'
-")
+  SET (CMD "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 ELSE (UNIX)
   SET (CMD "
 import sys


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Sep 2007 18:14:54 -0000	1.3
+++ .cvsignore	29 Jan 2008 19:08:06 -0000	1.4
@@ -1 +1 @@
-qgis-0.9.0.tar.gz
+qgis-0.9.1.tar.gz


Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-7/qgis.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qgis.spec	5 Oct 2007 12:56:48 -0000	1.7
+++ qgis.spec	29 Jan 2008 19:08:06 -0000	1.8
@@ -1,18 +1,19 @@
 %define qt4_bindir %{_libdir}/qt4/bin
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Summary: A user friendly Open Source Geographic Information System
 Name: qgis
-Version: 0.9.0
+Version: 0.9.1
 Release: 2%{?dist}
-#Epoch: 1
-License: GPLv2+
+Summary: A user friendly Open Source Geographic Information System
+
 Group: Applications/Engineering
+License: GPLv2+
+URL: http://qgis.org/
 Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
-Patch0: man-install-share-0.9.0.patch
-Patch1: lib64-suffix-0.9.0.patch
-URL: http://qgis.org/
+Patch0: python-site-packages-dir-0.9.1.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: qt4-devel
@@ -26,6 +27,8 @@
 BuildRequires: python-devel
 # grass package contains definitions needed for configure script
 BuildRequires: grass, grass-devel
+BuildRequires: python-devel
+BuildRequires: PyQt4-devel
 
 %description
 Quantum GIS (QGIS) is a user friendly Open Source Geographic Information 
@@ -35,6 +38,7 @@
 computer. It supports many common spatial data formats (e.g. ESRI ShapeFile, 
 geotiff). QGIS supports plugins to do things like display tracks from your GPS.
 
+
 #%package devel
 #Summary: Headers and libraries for building against qgis
 #Group: Development/Libraries
@@ -43,6 +47,7 @@
 #%description devel
 #Headers and libraries for building against qgis
 
+
 %package grass
 Summary: GRASS plugins for qgis
 Group: Applications/Engineering
@@ -52,6 +57,16 @@
 %description grass
 GRASS plugins for qgis
 
+
+#%package python
+#Summary: python integration and plugins
+#Group: Applications/Engineering
+#Requires: %{name} = %{version}-%{release}
+#
+#%description python
+#python integration and plugins
+
+
 %package theme-nkids
 Summary: Addtional theme for qgis - nkids
 Group: Applications/Engineering
@@ -60,16 +75,21 @@
 %description theme-nkids
 Addtional theme for qgis - nkids
 
+
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+
 
 %build
 for dir in %{_libdir}/grass-*/ ; do
 	GRASS_PREFIX=$dir
 done
 %cmake \
+	-D QGIS_MANUAL_SUBDIR=share/man \
+	-D QGIS_LIB_SUBDIR=%{_lib} \
+	-D QGIS_PLUGIN_SUBDIR=%{_lib}/qgis \
+	-D BINDINGS_GLOBAL_INSTALL:BOOL=ON \
 	-D GRASS_PREFIX=$GRASS_PREFIX \
 	-D GDAL_INCLUDE_DIR=%{_includedir}/gdal \
 	-D GDAL_LIBRARY=%{_libdir}/libgdal.so \
@@ -77,6 +97,7 @@
 	.
 make VERBOSE=1 %{?_smp_mflags}
 
+
 %install
 %{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot} install
@@ -111,6 +132,7 @@
 	--dir=%{buildroot}%{_datadir}/applications \
 	%{SOURCE1}
 
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -122,6 +144,7 @@
 
 %postun grass -p /sbin/ldconfig
 
+
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS BUGS COPYING ChangeLog README SPONSORS CONTRIBUTORS
@@ -158,16 +181,13 @@
 %dir %{_datadir}/%{name}/themes
 %dir %{_datadir}/%{name}/themes/default
 %{_datadir}/%{name}/themes/default/*.png
+%{python_sitearch}/%{name}
 %{_mandir}/man1/*
 
 #%files devel
 #%defattr(-, root, root, -)
 #%{_includedir}/%{name}
 
-%files theme-nkids
-%defattr(-, root, root, -)
-%{_datadir}/%{name}/themes/nkids
-
 %files grass
 %defattr(-, root, root, -)
 %{_libdir}/libqgisgrass.so
@@ -175,7 +195,26 @@
 %{_datadir}/%{name}/grass
 %{_datadir}/%{name}/themes/default/grass
 
+#%files python
+#%defattr(-, root, root, -)
+#%{_datadir}/%{name}/python
+
+%files theme-nkids
+%defattr(-, root, root, -)
+%{_datadir}/%{name}/themes/nkids
+
+
 %changelog
+* Mon Jan 28 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.1-2
+- defining lib path in build
+- installing python bindings globally
+- adding patch to determine python site packages dir correctly
+
+* Mon Dec 17 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.1-1
+- update to 0.9.1
+- removing lib64 and man instal path patches (included upstream)
+- enabling python integration
+
 * Fri Oct 05 2007 Douglas E. Warner <silfreed at silfreed.net> 0.9.0-2
 - enabling build for PPC64 (bug#247152)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Sep 2007 18:14:54 -0000	1.3
+++ sources	29 Jan 2008 19:08:06 -0000	1.4
@@ -1 +1 @@
-b3450bfbbe02818aae6b617fab0b86ee  qgis-0.9.0.tar.gz
+cc1be019033451ec6c4b3838b26d69ae  qgis-0.9.1.tar.gz


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


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


