rpms/python-basemap-data/devel python-basemap-data.spec, 1.15, 1.16 sources, 1.8, 1.9

[Jef Spaleta]

Author: jspaleta

Update of /cvs/pkgs/rpms/python-basemap-data/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21882

Modified Files:
	python-basemap-data.spec sources 
Log Message:
* Fri May 28 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> 0.99.4-2
- Move python-basemap-examples subpackage to python-basemap srpm 
- Make it possible to install python-basemap-data without python-basemap



Index: python-basemap-data.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap-data/devel/python-basemap-data.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- python-basemap-data.spec	11 Dec 2009 18:19:55 -0000	1.15
+++ python-basemap-data.spec	28 May 2010 23:04:53 -0000	1.16
@@ -2,18 +2,16 @@
 
 Name:           python-basemap-data
 Version:        0.99.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Data for python-basemap
 Group:          Development/Libraries
 License:        GPLv2 and Public Domain
 URL:            http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html
-Source1:        http://dl.sf.net/matplotlib/basemap-%{version}-examples.tar.gz
 Source0:        http://dl.sf.net/matplotlib/basemap-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
-Requires:	python-basemap
 
 %description
 Data for python-basemap
@@ -29,20 +27,11 @@ Requires:       python-basemap-data
 %{summary}.
 
 
-%package -n     python-basemap-examples
-Summary:        Example programs and data for python-basemap
-Group:          Development/Libraries
-License:        Copyright only
-Requires:       python-basemap
-
-%description -n python-basemap-examples
-%{summary}.
 
 
 %prep
-%setup -q -b 1 -n basemap-%{version}
+%setup -q -n basemap-%{version}
 
-cp README examples/COPYING
 
 
 %build
@@ -53,10 +42,6 @@ rm -rf $RPM_BUILD_ROOT
 # Install the data
 install -d $RPM_BUILD_ROOT%{_datadir}
 cp -a lib/mpl_toolkits/basemap/data/ $RPM_BUILD_ROOT%{_datadir}/basemap
-# Extract the hires data
-#pushd $RPM_BUILD_ROOT%{_datadir}/basemap
-#tar xzf %SOURCE1
-#popd
 
 
 %clean
@@ -76,12 +61,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/basemap/*_h.dat
 
 
-%files -n python-basemap-examples
-%defattr(-,root,root,-)
-%doc examples/*
 
 
 %changelog
+* Fri May 28 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> 0.99.4-2
+- Move python-basemap-examples subpackage to python-basemap srpm 
+- Make it possible to install python-basemap-data without python-basemap
+
 * Fri Dec 11 2009 Jon Ciesla <limb at jcomserv.net> - 0.99.4-1
 - Update to latest upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap-data/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	11 Dec 2009 18:19:55 -0000	1.8
+++ sources	28 May 2010 23:04:53 -0000	1.9
@@ -1,2 +1 @@
-3700f4d59b9b01e33db30b7c83f69071  basemap-0.99.4-examples.tar.gz
 07fe1a01c321c43db4739c18e99d4d44  basemap-0.99.4.tar.gz