diff --git a/.gitignore b/.gitignore index d9a6ad3..9ac3f19 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /scikit-image-0.11.0.tar.gz /scikit-image-0.11.2.tar.gz /scikit-image-0.11.3.tar.gz +/scikit-image-0.11.3-nolena.tar.gz diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..c61c7a9 --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +VERSION=$1 +tar -xzf scikit-image-$VERSION.tar.gz +pushd scikit-image-$VERSION +rm ./skimage/data/lena_RGB_U8.npy +rm ./skimage/data/lena.png +rm ./skimage/data/lena_GRAY_U8.npz +rm ./skimage/data/lenagray.png +rm ./skimage/data/lena_GRAY_U8.npy +rm ./skimage/data/lena_RGB_U8.npz +popd + +tar -czf scikit-image-$VERSION-nolena.tar.gz scikit-image-$VERSION diff --git a/python-scikit-image.spec b/python-scikit-image.spec index df6a621..80018ea 100644 --- a/python-scikit-image.spec +++ b/python-scikit-image.spec @@ -3,7 +3,7 @@ Name: python-scikit-image Version: 0.11.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Image processing in Python # The following files are BSD 2 clauses, the rest BSD 3 clauses # skimage/graph/_mcp.pyx @@ -11,7 +11,12 @@ Summary: Image processing in Python License: BSD URL: http://scikit-image.org/ -Source0: https://pypi.python.org/packages/source/s/scikit-image/scikit-image-%{version}.tar.gz +# Upstream contains images of problematic copyrigth +# I remove them by downloading the upstream tarbal and running +# ./generate-tarball.sh 0.11.3 +# Source0: https://pypi.python.org/packages/source/s/scikit-image/scikit-image-%{version}.tar.gz +Source0: scikit-image-%{version}-nolena.tar.gz +Source1: generate-tarball.sh BuildRequires: python2-devel python-setuptools numpy Cython BuildRequires: scipy python-matplotlib python-nose BuildRequires: python-six >= 1.3 @@ -89,7 +94,7 @@ pushd %{py3dir} popd %endif # with_python3 -%{__python2} setup.py install --skip-build --root %{buildroot} +%{__python2} setup.py install --skip-build --root %{buildroot} find %{buildroot} -name "*.so" | xargs chmod 755 @@ -131,6 +136,9 @@ popd %{_bindir}/skivi %changelog +* Tue Jan 05 2016 Sergio Pascual - 0.11.3-6 +- Tarball without problematic copyrigth images (fixes bz #1295193) + * Mon Nov 23 2015 Sergio Pascual - 0.11.3-5 - Provides python2-scikit-image diff --git a/sources b/sources index d203698..53dfc74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5cd60fe78adbe30254a87081f12500f9 scikit-image-0.11.3.tar.gz +cac85d2a255356c665f476203b89aa2e scikit-image-0.11.3-nolena.tar.gz