From e8b7d4f3da92e1b0c8cdd01a1d30d2232ad536f9 Mon Sep 17 00:00:00 2001
From: Jef Spaleta <jspaleta@fedoraproject.org>
Date: Jul 11 2010 01:24:21 +0000
Subject: - New upstream release

- Remove undistributable file from bundled agg library

---

diff --git a/.cvsignore b/.cvsignore
index 69ffcc8..7048a9b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-matplotlib-0.99.3.tar.gz
+matplotlib-1.0.0-without-gpc.tar.gz
diff --git a/generate-tarball.sh b/generate-tarball.sh
new file mode 100755
index 0000000..c1cafe4
--- /dev/null
+++ b/generate-tarball.sh
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+version=$1
+
+[ -z $version ] && exit 1
+
+dir=matplotlib-${version}
+file=matplotlib-${version}.tar.gz
+result=matplotlib-${version}-without-gpc.tar.gz
+
+rm -rf matplotlib-${version}
+tar xzf $file
+
+rm matplotlib-${version}/agg24/include/agg_conv_gpc.h
+
+rm -f $result
+tar czf $result $dir
diff --git a/python-matplotlib.spec b/python-matplotlib.spec
index 22f9658..c57e855 100644
--- a/python-matplotlib.spec
+++ b/python-matplotlib.spec
@@ -1,14 +1,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-matplotlib
-Version:        0.99.3
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        Python plotting library
 
 Group:          Development/Libraries
 License:        Python
 URL:            http://sourceforge.net/projects/matplotlib
-Source0:        http://downloads.sourceforge.net/matplotlib/matplotlib-%{version}.tar.gz
+#Modified Sources to remove the one undistributable file
+#See generate-tarball.sh in fedora cvs repository for logic
+#sha1sum matplotlib-1.0.0-without-gpc.tar.gz 
+#c3c2cb82ee122b36977f636948bb4a79b15c03ba  matplotlib-1.0.0-without-gpc.tar.gz
+Source0:        http://downloads.sourceforge.net/matplotlib/matplotlib-%{version}-without-gpc.tar.gz
 Source1:        setup.cfg
 Patch0:         matplotlib-gcc43.patch
 Patch1:         matplotlib_gtk_tooltip.patch 
@@ -42,7 +46,7 @@ Requires:       tkinter
 %setup -q -n matplotlib-%{version}
 #%setup -q -n matplotlib-0.99.3
 #%patch0 -p1
-%patch1 -p0
+#%patch1 -p0
 chmod -x lib/matplotlib/mpl-data/images/*.svg
 
 %build
@@ -81,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 8 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 1.0.0-1
+- New upstream release  
+- Remove undistributable file from bundled agg library 
+
 * Thu Jul 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.3-1
 - New upstream release  
 
diff --git a/sources b/sources
index 55b17ee..2c82007 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c21a367dea3b98660adbb898a2f53dbc  matplotlib-0.99.3.tar.gz
+b5478c7027e49d7c8e91bd8ddb5f2955  matplotlib-1.0.0-without-gpc.tar.gz