From ee7e32500bcc71ffd71588e7d4a9dcc7e2e53202 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Jun 03 2016 13:06:15 +0000 Subject: Upstream no longer ships non-free images, use pristine source. --- diff --git a/.gitignore b/.gitignore index e693a7b..008d36c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ matplotlib-1.0.0-without-gpc.tar.gz /matplotlib-1.4.3-without-gpc.tar.xz /matplotlib-1.4.3-without-extern.tar.xz /matplotlib-1.5.1-without-extern.tar.xz +/matplotlib-1.5.1.tar.gz diff --git a/generate-tarball.sh b/generate-tarball.sh deleted file mode 100755 index 4b9e934..0000000 --- a/generate-tarball.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh - -version=$1 - -[ -z $version ] && exit 1 - -dir=matplotlib-${version} -file=matplotlib-${version}.tar.gz -file=v${version}.tar.gz -result=matplotlib-${version}-without-extern.tar.xz - -test -f $file || wget -v https://github.com/matplotlib/matplotlib/archive/$file - -rm -rf matplotlib-${version} -tar xzf $file - -rm -vr matplotlib-${version}/extern/qhull -rm -vr matplotlib-${version}/lib/matplotlib/mpl-data/sample_data/lena.* - -rm -f $result -tar cJf $result $dir diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 292bd98..6500b8b 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -46,14 +46,13 @@ Name: python-matplotlib Version: 1.5.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Python 2D plotting library Group: Development/Libraries # qt4_editor backend is MIT License: Python and MIT URL: http://matplotlib.org -#Modified Sources to remove the bundled libraries -Source0: matplotlib-%{version}-without-extern.tar.xz +Source0: https://github.com/matplotlib/matplotlib/archive/v%{version}.tar.gz#/matplotlib-%{version}.tar.gz Source1: setup.cfg #Patch0: %{name}-noagg.patch @@ -352,7 +351,7 @@ Requires: python3-tkinter %prep %setup -q -n matplotlib-%{version} -rm -r lib/matplotlib/externals +rm -r {extern/qhull,lib/matplotlib/externals} # Copy setup.cfg to the builddir sed 's/\(backend = \).*/\1%{backend}/' >setup.cfg <%{SOURCE1} @@ -576,6 +575,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %endif %changelog +* Mon May 23 2016 Dominik Mierzejewski - 1.5.1-6 +- Upstream no longer ships non-free images, use pristine source. + * Wed May 18 2016 Dominik Mierzejewski - 1.5.1-5 - Unbundle python-six (#1336740). - Run tests (and temporarily disable failing ones). diff --git a/sources b/sources index 23bbedc..87530fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f111778585a8f65e5e9464b6084d556b matplotlib-1.5.1-without-extern.tar.xz +b22dc4962f36aab919a7125b3b35953b matplotlib-1.5.1.tar.gz