rpms/python-basemap-data/devel .cvsignore, 1.4, 1.5 python-basemap-data.spec, 1.6, 1.7 sources, 1.4, 1.5

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/python-basemap-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7704

Modified Files:
	.cvsignore python-basemap-data.spec sources 
Log Message:
- Split into regular and -hires packages
- Ship the basemap examples in python-basemap-examples



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-basemap-data/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jul 2006 21:28:37 -0000	1.4
+++ .cvsignore	28 Mar 2007 23:20:08 -0000	1.5
@@ -1 +1,2 @@
-basemap-data-0.9.tar.gz
+basemap-0.9.5.tgz
+basemap-data-hires-0.9.5.tgz


Index: python-basemap-data.spec
===================================================================
RCS file: /cvs/extras/rpms/python-basemap-data/devel/python-basemap-data.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-basemap-data.spec	19 Feb 2007 16:35:50 -0000	1.6
+++ python-basemap-data.spec	28 Mar 2007 23:20:08 -0000	1.7
@@ -1,13 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-basemap-data
-Version:        0.9
-Release:        2%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Data for python-basemap
 Group:          Development/Libraries
 License:        GPL
 URL:            http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html
-Source0:        http://dl.sf.net/matplotlib/basemap-data-%{version}.tar.gz
+Source0:        http://dl.sf.net/matplotlib/basemap-%{version}.tgz
+Source1:        http://dl.sf.net/matplotlib/basemap-data-hires-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -17,8 +18,27 @@
 %description
 Data for python-basemap
 
+
+%package        hires
+Summary:        High resolution map data for python-basemap
+Group:          Development/Libraries
+Requires:       python-basemap-data
+
+%description    hires
+%{summary}.
+
+
+%package -n     python-basemap-examples
+Summary:        Example programs and data for python-basemap
+Group:          Development/Libraries
+Requires:       python-basemap
+
+%description -n python-basemap-examples
+%{summary}.
+
+
 %prep
-%setup -q -n basemap-data-%{version}
+%setup -q -n basemap-%{version}
 
 
 %build
@@ -26,7 +46,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --root=$RPM_BUILD_ROOT
+# Install the data
+install -d $RPM_BUILD_ROOT%{_datadir}
+cp -a lib/matplotlib/toolkits/basemap/data $RPM_BUILD_ROOT%{_datadir}/basemap
+# Extract the hires data
+pushd $RPM_BUILD_ROOT%{_datadir}/basemap
+tar xzf %SOURCE1
+popd
 
 
 %clean
@@ -36,10 +62,26 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE_data
-%{_datadir}/basemap/*
+%{_datadir}/basemap/
+%exclude %{_datadir}/basemap/*_h.txt
+
+
+%files hires
+%defattr(-,root,root,-)
+%doc LICENSE_data
+%{_datadir}/basemap/*_h.txt
+
+
+%files -n python-basemap-examples
+%defattr(-,root,root,-)
+%doc examples/*
 
 
 %changelog
+* Wed Mar 28 2007 Orion Poplawski <orion at cora.nwra.com> 0.9.5-1
+- Split into regular and -hires packages
+- Ship the basemap examples in python-basemap-examples
+
 * Mon Feb 19 2007 Orion Poplawski <orion at cora.nwra.com> 0.9-2
 - Add BR: python-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-basemap-data/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Jul 2006 21:28:37 -0000	1.4
+++ sources	28 Mar 2007 23:20:08 -0000	1.5
@@ -1 +1,2 @@
-5c4baf8f3de54193d64ab31c363a0e89  basemap-data-0.9.tar.gz
+d214dc6a7201080a8e7419f2a5c8306b  basemap-0.9.5.tgz
+4d3cd42750271f3f91d9aa72eca46935  basemap-data-hires-0.9.5.tgz