diff --git a/vigra.spec b/vigra.spec index 9e2df9e..d42d00a 100644 --- a/vigra.spec +++ b/vigra.spec @@ -2,15 +2,17 @@ Summary: Generic Programming for Computer Vision Name: vigra Version: 1.9.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Group: Development/Libraries Source: http://hci.iwr.uni-heidelberg.de/%{name}/%{name}-%{version}-src.tar.gz URL: http://hci.iwr.uni-heidelberg.de/vigra/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel libjpeg-devel libpng-devel libtiff-devel fftw-devel >= 3 -BuildRequires: cmake hdf5-devel boost-devel boost-python doxygen python-sphinx numpy-f2py -BuildRequires: OpenEXR-devel +BuildRequires: cmake boost-devel doxygen +%if ! 0%{?rhel} +BuildRequires: hdf5-devel python-sphinx numpy-f2py boost-python OpenEXR-devel +%endif %description VIGRA stands for "Vision with Generic Algorithms". It's a novel computer vision @@ -30,6 +32,7 @@ Requires: hdf5-devel boost-devel boost-python numpy-f2py OpenEXR-devel The vigra-devel package includes the header files necessary for developing programs that use the vigra library. +%if ! 0%{?rhel} %package python Summary: Python interface for the vigra computer vision library Requires: vigra = %{version}-%{release} @@ -37,12 +40,17 @@ Requires: numpy numpy-f2py %description python The vigra-python package provides python bindings for vigra +%endif %prep %setup -q %build -%cmake . -DWITH_OPENEXR=1 -DWITH_HDF5=1 +%if ! 0%{?rhel} +%cmake . -DWITH_OPENEXR=1 -DWITH_HDF5=1 -DWITH_VIGRANUMPY=1 -DWITH_VALGRIND=0 +%else +%cmake . -DWITH_OPENEXR=0 -DWITH_HDF5=0 -DWITH_VIGRANUMPY=0 -DWITH_VALGRIND=0 +%endif make VERBOSE=1 %{?_smp_mflags} # cleanup rm -f doc/vigranumpy/.buildinfo @@ -76,11 +84,16 @@ rm -rf %{buildroot} %{_libdir}/vigra %doc doc/vigra doc/vigranumpy +%if ! 0%{?rhel} %files python %defattr(-, root, root,-) %{python_sitearch}/vigra +%endif %changelog +* Thu Feb 14 2013 Caolán McNamara - 1.9.0-4 +- no hdf5-devel in RHEL-7 + * Sat Feb 09 2013 Denis Arnaud - 1.9.0-3 - Rebuild for Boost-1.53.0