- update to metis 0.11.0

- remove python patch
- enabling python subpackage
- fixed executable perms on new headers/source
- stripping rpath with chrpath
- making python libs executable to get files stripped

.cvsignore

@@ -1 +1 @@
-qgis_0.10.0.tar.gz
+qgis_0.11.0.tar.gz

python-site-packages-dir-0.9.1.patch

@@ -1,16 +0,0 @@
-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

qgis.spec

@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: qgis
-Version: 0.10.0
+Version: 0.11.0
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: A user friendly Open Source Geographic Information System
 
 Group: Applications/Engineering
@@ -11,11 +11,9 @@ License: GPLv2+
 URL: http://qgis.org/
 Source0: http://download.osgeo.org/qgis/src/%{name}_%{version}.tar.gz
 Source1: %{name}.desktop
-Patch0: python-site-packages-dir-0.9.1.patch
+#Patch0: qgis-0.10.0-cmake-2.6.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: sip
-Requires: PyQt4
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: qt4-devel
@@ -30,7 +28,7 @@ BuildRequires: sqlite-devel
 BuildRequires: grass, grass-devel
 BuildRequires: python-devel
 BuildRequires: PyQt4-devel
-BuildRequires: openssl-devel
+BuildRequires: chrpath
 
 %description
 Quantum GIS (QGIS) is a user friendly Open Source Geographic Information 
@@ -60,13 +58,15 @@ Requires: grass
 GRASS plugins for qgis
 
 
-#%package python
+%package python
-#Summary: python integration and plugins
+Summary: Python integration and plugins for qgis
-#Group: Applications/Engineering
+Group: Applications/Engineering
-#Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
-#
+Requires: sip
-#%description python
+Requires: PyQt4
-#python integration and plugins
+
+%description python
+Python integration and plugins for qgis
 
 
 %package theme-nkids
@@ -80,12 +80,14 @@ Addtional theme for qgis - nkids
 
 %prep
 %setup -q -n %{name}_%{version}
-%patch0 -p1
+#%patch0 -p1
 
 # fix spurious executable bits
 %{__chmod} -x \
 	./src/app/legend/qgslegend.h \
-	./src/app/legend/qgslegend.cpp
+	./src/app/legend/qgslegend.cpp \
+	./src/gui/qgsdetaileditem*.cpp \
+	./src/gui/qgsdetaileditem*.h
 
 
 %build
@@ -106,17 +108,25 @@ make VERBOSE=1 %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make VERBOSE=1 DESTDIR=%{buildroot} install
+
+# remove rpath from files
+chrpath --delete \
+	%{buildroot}%{_bindir}/%{name} \
+	%{buildroot}%{python_sitearch}/%{name}/*.so
+
+# add executable perms to python libs so they get striped
+%{__chmod} +x %{buildroot}%{python_sitearch}/%{name}/*.so
 
 # remove files packaged by doc
-%{__rm} -f %{buildroot}/%{_datadir}/doc/AUTHORS \
+%{__rm} -f %{buildroot}%{_datadir}/doc/AUTHORS \
-	%{buildroot}/%{_datadir}/doc/SPONSORS
+	%{buildroot}%{_datadir}/doc/SPONSORS
 
 # install desktop file
-%{__install} -d %{buildroot}/%{_datadir}/pixmaps
+%{__install} -d %{buildroot}%{_datadir}/pixmaps
 %{__install} -m0644 \
-	%{buildroot}/%{_datadir}/%{name}/images/icons/qgis-icon.png \
+	%{buildroot}%{_datadir}/%{name}/images/icons/qgis-icon.png \
-	%{buildroot}/%{_datadir}/pixmaps/%{name}.png
+	%{buildroot}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor="fedora" \
 	--dir=%{buildroot}%{_datadir}/applications \
 	%{SOURCE1}
@@ -133,6 +143,10 @@ desktop-file-install --vendor="fedora" \
 
 %postun grass -p /sbin/ldconfig
 
+%post python -p /sbin/ldconfig
+
+%postun python -p /sbin/ldconfig
+
 
 %files
 %defattr(-, root, root, -)
@@ -148,6 +162,7 @@ desktop-file-install --vendor="fedora" \
 %{_libdir}/%{name}/libgpsimporterplugin.so
 %{_libdir}/%{name}/libgpxprovider.so
 %{_libdir}/%{name}/libgridmakerplugin.so
+%{_libdir}/%{name}/libmemoryprovider.so
 %{_libdir}/%{name}/libnortharrowplugin.so
 %{_libdir}/%{name}/libogrprovider.so
 %{_libdir}/%{name}/libpggeoprocessingplugin.so
@@ -164,13 +179,11 @@ desktop-file-install --vendor="fedora" \
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/i18n
 %{_datadir}/%{name}/images
-%{_datadir}/%{name}/python
 %{_datadir}/%{name}/resources
 %{_datadir}/%{name}/svg
 %dir %{_datadir}/%{name}/themes
 %dir %{_datadir}/%{name}/themes/default
 %{_datadir}/%{name}/themes/default/*.png
-%{python_sitearch}/%{name}
 %{_mandir}/man1/*
 
 %files devel
@@ -178,6 +191,7 @@ desktop-file-install --vendor="fedora" \
 %{_includedir}/%{name}
 %{_libdir}/lib%{name}_*.so
 %{_libdir}/libqgisgrass.so
+%{_libdir}/libqgispython.so
 
 %files grass
 %defattr(-, root, root, -)
@@ -186,9 +200,11 @@ desktop-file-install --vendor="fedora" \
 %{_datadir}/%{name}/grass
 %{_datadir}/%{name}/themes/default/grass
 
-#%files python
+%files python
-#%defattr(-, root, root, -)
+%defattr(-, root, root, -)
-#%{_datadir}/%{name}/python
+%{_libdir}/libqgispython.so.*
+%{_datadir}/%{name}/python
+%{python_sitearch}/%{name}
 
 %files theme-nkids
 %defattr(-, root, root, -)
@@ -196,8 +212,16 @@ desktop-file-install --vendor="fedora" \
 
 
 %changelog
-* Fri Jun 06 2008 Caolán McNamara <caolanm@redhat.com> - 0.10.0-2
+* Wed Jul 16 2008 Douglas E. Warner <silfreed@silfreed.net> 0.11.0-1
-- add openssl BuildDepend to rebuild for dependancies
+- update to metis 0.11.0
+- remove python patch
+- enabling python subpackage
+- fixed executable perms on new headers/source
+- stripping rpath with chrpath
+- making python libs executable to get files stripped
+
+* Fri Mar 28 2008 Douglas E. Warner <silfreed@silfreed.net> 0.10.0-2
+- added patch to support cmake 2.6
 
 * Fri Mar 28 2008 Balint Cristian <rezso@rdsor.ro> - 0.10.0-1
 - upgraded to 0.10.0 release candidate

sources

@@ -1 +1 @@
-01fba16f6e6e4f2cd832b520dfd05dd8  qgis_0.10.0.tar.gz
+33a2c5bab0e61fd443250ccd431b6e48  qgis_0.11.0.tar.gz