upstream stable 1.11.1 release

This commit is contained in:
Bruno Postle 2017-12-11 13:08:34 +00:00
parent d55ec81d94
commit d0ddd01d58
3 changed files with 11 additions and 13 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ vigra-1.7.0-src.tar.gz
/vigra-1.10.0-src.tar.gz
/vigra-1.10.0-src-clean.tar.gz
/vigra-1.11.0-src-clean.tar.gz
/vigra-1.11.1-src.tar.gz

View File

@ -1,2 +1 @@
e86d096099ccc8f139b6c6fff7b7557e vigra-1.11.0-src-clean.tar.gz
20eea436aae0ef58230ae3585f04e88f vigra-config.sh
SHA512 (vigra-1.11.1-src.tar.gz) = 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3

View File

@ -1,16 +1,15 @@
%{!?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.11.0
Release: 11%{?dist}
Version: 1.11.1
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.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
Source0: https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz
Source1: vigra-config.sh
URL: http://ukoethe.github.io/vigra/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -20,10 +19,7 @@ BuildRequires: cmake boost-devel doxygen coin-or-lemon-devel
BuildRequires: hdf5-devel python2-sphinx numpy-f2py boost-python2 OpenEXR-devel
%endif
Patch0: vigra.rhbz987048.shebang.patch
# https://github.com/ukoethe/vigra/pull/212
Patch2: vigra-1.10.0-no-lenna.patch
# https://github.com/ukoethe/vigra/pull/405
Patch3: vigra-1.11.0-const-swap.patch
%description
VIGRA stands for "Vision with Generic Algorithms". It's a novel computer vision
@ -63,16 +59,15 @@ The python2-vigra package provides python bindings for vigra
%prep
%setup -q
#patch0 -p1 -b .rhbz987048.shebang.patch
%patch0 -p1
%patch2 -p1 -b .no-lenna
%patch3 -p1 -b .const-swap
%build
%if ! 0%{?rhel}
%cmake . -DWITH_OPENEXR=1 -DWITH_HDF5=1 -DWITH_VIGRANUMPY=1 -DWITH_VALGRIND=0
%cmake . -DWITH_OPENEXR=1 -DWITH_HDF5=1 -DWITH_VIGRANUMPY=1 -DWITH_VALGRIND=0 -DWITH_LEMON=1
%else
%cmake . -DWITH_OPENEXR=0 -DWITH_HDF5=0 -DWITH_VIGRANUMPY=0 -DWITH_VALGRIND=0
%cmake . -DWITH_OPENEXR=0 -DWITH_HDF5=0 -DWITH_VIGRANUMPY=0 -DWITH_VALGRIND=0 -DWITH_LEMON=1
%endif
make VERBOSE=1 %{?_smp_mflags}
# cleanup
@ -117,6 +112,9 @@ rm -rf %{buildroot}
%endif
%changelog
* Sun Dec 10 2017 Bruno Postle <bruno@postle.net> - 1.11.1-1
- Upstream stable release
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.11.0-11
- Add Provides for the old name without %%_isa