rpms
/
vigra
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove all the non-free lenna files

This commit is contained in:
Tom Callaway 2016-02-02 16:26:05 -05:00
parent ad0725454c
commit 129ee5d315
4 changed files with 64 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ vigra-1.7.0-src.tar.gz
/vigra-1.9.0-src.tar.gz
/vigra-config.sh
/vigra-1.10.0-src.tar.gz
/vigra-1.10.0-src-clean.tar.gz

2
sources
View File

@ -1,2 +1,2 @@
85e2968e4ee5f9541b5dd8b3fb9cc433 vigra-1.10.0-src.tar.gz
20eea436aae0ef58230ae3585f04e88f vigra-config.sh
1eb583b133f274c5ae98291a72625482 vigra-1.10.0-src-clean.tar.gz

49
vigra-1.10.0-no-lenna.patch Normal file
View File

@ -0,0 +1,49 @@
diff -up vigra-1.10.0/test/convolution/CMakeLists.txt.no-lenna vigra-1.10.0/test/convolution/CMakeLists.txt
--- vigra-1.10.0/test/convolution/CMakeLists.txt.no-lenna 2013-11-18 11:48:16.000000000 -0500
+++ vigra-1.10.0/test/convolution/CMakeLists.txt 2016-02-02 16:14:12.717684303 -0500
@@ -1,3 +1 @@
VIGRA_ADD_TEST(test_convolution test.cxx LIBRARIES vigraimpex)
-
-VIGRA_COPY_TEST_DATA(lenna128.xv lenna_simple_sharpening_orig.xv lenna_gaussian_sharpening_orig.xv lenna128sepgrad.xv lennahessxx.xv lennastxx.xv lenna128recgrad.xv lenna128nonlinear.xv resampling.xv lennahessyy.xv lennastyy.xv lennahessxy.xv lennastxy.xv lenna128rgb.xv lenna128rgbsepgrad.xv lenna_level-2.xv lenna_level-1.xv lenna_level1.xv lenna_level2.xv lenna_levellap0.xv lenna_levellap1.xv lenna_levellap2.xv lennargbst.xv)
diff -up vigra-1.10.0/test/image/CMakeLists.txt.no-lenna vigra-1.10.0/test/image/CMakeLists.txt
--- vigra-1.10.0/test/image/CMakeLists.txt.no-lenna 2013-11-18 11:48:16.000000000 -0500
+++ vigra-1.10.0/test/image/CMakeLists.txt 2016-02-02 16:14:12.717684303 -0500
@@ -1,3 +1,2 @@
VIGRA_ADD_TEST(test_image test.cxx LIBRARIES vigraimpex)
-VIGRA_COPY_TEST_DATA(lenna.xv)
diff -up vigra-1.10.0/test/imgproc/CMakeLists.txt.no-lenna vigra-1.10.0/test/imgproc/CMakeLists.txt
--- vigra-1.10.0/test/imgproc/CMakeLists.txt.no-lenna 2016-02-02 16:15:28.441127606 -0500
+++ vigra-1.10.0/test/imgproc/CMakeLists.txt 2016-02-02 16:15:35.169078143 -0500
@@ -1,3 +1 @@
VIGRA_ADD_TEST(test_imgproc test.cxx LIBRARIES vigraimpex)
-
-VIGRA_COPY_TEST_DATA(lenna128.xv lenna128rgb.xv splineimageview2.xv splineimageview3.xv splineimageview5.xv lenna42lin.xv lenna288neu.xv lenna42neu.xv lenna288rgbneu.xv lenna42rgbneu.xv lenna367FIR.xv lenna42FIR.xv lenna367IIR.xv lenna42IIR.xv lenna42linrgb.xv lennargb42FIR.xv lennargb42IIR.xv lenna_rotate.xv)
diff -up vigra-1.10.0/test/impex/CMakeLists.txt.no-lenna vigra-1.10.0/test/impex/CMakeLists.txt
--- vigra-1.10.0/test/impex/CMakeLists.txt.no-lenna 2016-02-02 16:15:50.345966568 -0500
+++ vigra-1.10.0/test/impex/CMakeLists.txt 2016-02-02 16:15:59.993895639 -0500
@@ -17,5 +17,3 @@ ENDIF(OPENEXR_FOUND)
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)
-
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
+++ vigra-1.10.0/test/simpleanalysis/CMakeLists.txt 2016-02-02 16:15:14.169232529 -0500
@@ -7,4 +7,4 @@ else()
VIGRA_ADD_TEST(test_simpleanalysis test.cxx LIBRARIES vigraimpex)
endif()
-VIGRA_COPY_TEST_DATA(noiseNormalizationTest.xv slantedEdgeMTF.xv lenna128.xv)
+VIGRA_COPY_TEST_DATA(noiseNormalizationTest.xv slantedEdgeMTF.xv)
diff -up vigra-1.10.0/test/slic2d/CMakeLists.txt.no-lenna vigra-1.10.0/test/slic2d/CMakeLists.txt
--- vigra-1.10.0/test/slic2d/CMakeLists.txt.no-lenna 2013-11-18 11:48:16.000000000 -0500
+++ vigra-1.10.0/test/slic2d/CMakeLists.txt 2016-02-02 16:14:12.717684303 -0500
@@ -1,3 +1,3 @@
-VIGRA_COPY_TEST_DATA(lenna.xv slic.xv)
-VIGRA_ADD_TEST(test_slic2d test.cxx LIBRARIES vigraimpex)
\ No newline at end of file
+VIGRA_COPY_TEST_DATA(slic.xv)
+VIGRA_ADD_TEST(test_slic2d test.cxx LIBRARIES vigraimpex)

15
vigra.spec
View File

@ -2,10 +2,15 @@
Summary: Generic Programming for Computer Vision
Name: vigra
Version: 1.10.0
Release: 17%{?dist}
Release: 18%{?dist}
License: MIT
Group: Development/Libraries
Source0: http://hci.iwr.uni-heidelberg.de/%{name}/%{name}-%{version}-src.tar.gz
# 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/
# Source0: http://hci.iwr.uni-heidelberg.de/%%{name}/%%{name}-%%{version}-src.tar.gz
Source0: %{name}-%{version}-src-clean.tar.gz
Source1: vigra-config.sh
URL: http://hci.iwr.uni-heidelberg.de/vigra/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -17,6 +22,8 @@ BuildRequires: hdf5-devel python-sphinx numpy-f2py boost-python OpenEXR-devel
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
VIGRA stands for "Vision with Generic Algorithms". It's a novel computer vision
@ -53,6 +60,7 @@ The vigra-python package provides python bindings for vigra
%setup -q
%patch0 -p1 -b .rhbz987048.shebang.patch
%patch1 -p1 -b .transparent-alpha-fix.patch
%patch2 -p1 -b .no-lenna
%build
%if ! 0%{?rhel}
@ -103,6 +111,9 @@ rm -rf %{buildroot}
%endif
%changelog
* Tue Feb 2 2016 Tom Callaway <spot@fedoraproject.org> - 1.10.0-18
- remove lenna files (non-free)
* Thu Jan 21 2016 Orion Poplawski <orion@cora.nwra.com> - 1.10.0-17
- Rebuild for hdf5 1.8.16