diff --git a/.gitignore b/.gitignore index 41f1fce..250f927 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ matplotlib-1.0.0-without-gpc.tar.gz /matplotlib-2.0.0b4.tar.gz /matplotlib-2.0.0rc2.tar.gz /matplotlib-2.0.0.tar.gz +/matplotlib-2.0.0-without-copyrighted.tar.xz diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 1932df7..f091534 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -55,13 +55,14 @@ Name: python-matplotlib Version: 2.0.0 -Release: 2%{?rctag:.%{rctag}}%{?dist}.1 +Release: 2%{?rctag:.%{rctag}}%{?dist}.2 Summary: Python 2D plotting library Group: Development/Libraries # qt4_editor backend is MIT License: Python and MIT URL: http://matplotlib.org -Source0: https://github.com/matplotlib/matplotlib/archive/v%{version}%{?rctag}.tar.gz#/matplotlib-%{version}%{?rctag}.tar.gz +#Source0: https://github.com/matplotlib/matplotlib/archive/v%{version}%{?rctag}.tar.gz#/matplotlib-%{version}%{?rctag}.tar.gz +Source0: matplotlib-%{version}-without-copyrighted.tar.xz Source1: setup.cfg Patch2: 20_matplotlibrc_path_search_fix.patch @@ -620,6 +621,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %endif %changelog +* Mon Mar 06 2017 Thomas Spura - 2.0.0-2.2 +- Remove copyrighted file from tarball (gh-8034) + * Sat Feb 11 2017 Fedora Release Engineering - 2.0.0-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/remove-files.sh b/remove-files.sh new file mode 100755 index 0000000..c7a6624 --- /dev/null +++ b/remove-files.sh @@ -0,0 +1,21 @@ +#! /bin/sh + +version=$1 + +[ -z $version ] && exit 1 + +dir=matplotlib-${version} +file=matplotlib-${version}.tar.gz +result=matplotlib-${version}-without-copyrighted.tar.xz + +test -f $file || exit 1 + +rm -rf matplotlib-${version} +tar xzf $file + +# https://github.com/matplotlib/matplotlib/issues/8034 +rm -vr matplotlib-${version}/lib/matplotlib/mpl-data/sample_data/necked_tensile_specimen.png +rm -vr matplotlib-${version}/examples/images_contours_and_fields/interpolation_none_vs_nearest.py + +rm -f $result +tar cJf $result $dir diff --git a/sources b/sources index 4fc5a86..390ce37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (matplotlib-2.0.0.tar.gz) = b0e6d91aee5f91e0155c9e6716eef1a7e1fb907daeb93d603709142b749878fd758e42fe3707ac73c3d87959c6a35126c9e17c08ef78c5734106fafdf198f304 +SHA512 (matplotlib-2.0.0-without-copyrighted.tar.xz) = 6413b0187b3d7ce5e4cbfaf7de4f42a747f1a415dbe3dca71c5f0ff0b8ac7139dc2807302bfbc67428281cfc7744cc23c6bbda041cd0568eff71801a740b862d