diff --git a/.gitignore b/.gitignore index d846503..81c98de 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ vigra-1.7.0-src.tar.gz /vigra-config.sh /vigra-1.10.0-src.tar.gz /vigra-1.10.0-src-clean.tar.gz +/vigra-1.11.0-src-clean.tar.gz diff --git a/sources b/sources index b806859..261a3a8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -20eea436aae0ef58230ae3585f04e88f vigra-config.sh -1eb583b133f274c5ae98291a72625482 vigra-1.10.0-src-clean.tar.gz +e86d096099ccc8f139b6c6fff7b7557e vigra-1.11.0-src-clean.tar.gz diff --git a/vigra-1.10.0-no-lenna.patch b/vigra-1.10.0-no-lenna.patch index d40d871..5309530 100644 --- a/vigra-1.10.0-no-lenna.patch +++ b/vigra-1.10.0-no-lenna.patch @@ -26,7 +26,7 @@ diff -up vigra-1.10.0/test/impex/CMakeLists.txt.no-lenna vigra-1.10.0/test/impex VIGRA_ADD_TEST(test_impex test.cxx LIBRARIES vigraimpex) --VIGRA_COPY_TEST_DATA(lenna.xv lenna_gifref.xv lennafloat.xv lennafloatrgb.xv lennargb.xv no-image.txt lenna_0.tif lenna_1.tif lenna_2.tif lenna_masked_color.tif lenna_masked_gray.tif) +-VIGRA_COPY_TEST_DATA(lenna.xv lenna_gifref.xv lennafloat.xv lennafloatrgb.xv lennargb.xv no-image.txt lenna_0.tif lenna_1.tif lenna_2.tif lenna_masked_color.tif lenna_masked_gray.tif bilevel.tiff) - diff -up vigra-1.10.0/test/simpleanalysis/CMakeLists.txt.no-lenna vigra-1.10.0/test/simpleanalysis/CMakeLists.txt --- vigra-1.10.0/test/simpleanalysis/CMakeLists.txt.no-lenna 2016-02-02 16:15:04.689302222 -0500 diff --git a/vigra.rhbz987048.shebang.patch b/vigra.rhbz987048.shebang.patch index 6efdc3b..b6f04af 100644 --- a/vigra.rhbz987048.shebang.patch +++ b/vigra.rhbz987048.shebang.patch @@ -1,8 +1,8 @@ ---- vigra-1.9.0/config/vigra-config.in 2013-07-24 14:48:19.473868084 +0100 -+++ vigra-1.9.0/config/vigra-config.in 2013-07-24 14:48:55.747333616 +0100 +--- vigra-1.11.0/config/vigra-config.in 2016-03-17 10:22:21.000000000 +0000 ++++ vigra-1.11.0/config/vigra-config.in 2016-04-13 20:16:18.555519408 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python - from optparse import OptionParser - import sys + from __future__ import division, print_function + diff --git a/vigra.spec b/vigra.spec index fb53a2c..e56b10a 100644 --- a/vigra.spec +++ b/vigra.spec @@ -1,14 +1,14 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Summary: Generic Programming for Computer Vision Name: vigra -Version: 1.10.0 -Release: 18%{?dist} +Version: 1.11.0 +Release: 1%{?dist} License: MIT Group: Development/Libraries # The "Lenna" files are non-free, we need to remove them from the source tarball. -# tar xf vigra-1.10.0-src.tar.gz -# find vigra-1.10.0/ -name "lenna*" -delete -# tar cf vigra-1.10.0-src-clean.tar.gz vigra-1.10.0/ +# tar xf vigra-1.11.0-src.tar.gz +# find vigra-1.11.0/ -name "lenna*" -delete +# tar zcf vigra-1.11.0-src-clean.tar.gz vigra-1.11.0/ # Source0: http://hci.iwr.uni-heidelberg.de/%%{name}/%%{name}-%%{version}-src.tar.gz Source0: %{name}-%{version}-src-clean.tar.gz Source1: vigra-config.sh @@ -21,8 +21,6 @@ BuildRequires: hdf5-devel python-sphinx numpy-f2py boost-python OpenEXR-devel %endif Patch0: vigra.rhbz987048.shebang.patch # https://github.com/ukoethe/vigra/pull/212 -Patch1: vigra.transparent-alpha-fix.patch -# Remove references to lenna in the makefiles Patch2: vigra-1.10.0-no-lenna.patch %description @@ -58,8 +56,8 @@ The vigra-python package provides python bindings for vigra %prep %setup -q -%patch0 -p1 -b .rhbz987048.shebang.patch -%patch1 -p1 -b .transparent-alpha-fix.patch +#patch0 -p1 -b .rhbz987048.shebang.patch +%patch0 -p1 %patch2 -p1 -b .no-lenna %build @@ -111,6 +109,9 @@ rm -rf %{buildroot} %endif %changelog +* Wed Apr 13 2016 Bruno Postle - 1.11.0-1 +- Upstream stable release + * Tue Feb 2 2016 Tom Callaway - 1.10.0-18 - remove lenna files (non-free)