vigra.spec.diff

Index: SPECS/vigra.spec
===================================================================
--- SPECS/vigra.spec	(révision 855922)
+++ SPECS/vigra.spec	(copie de travail)
@@ -1,27 +1,29 @@
-%define major   2
-%define libname %mklibname %{name} %{major}
-%define olddevel %libname-devel
+%define major        2
+%define libname      %mklibname %{name} %{major}
+%define olddevel     %libname-devel
 %define libnamedevel %mklibname %{name} -d

 Name:           vigra
 Version:        1.9.0
-Release:        %mkrel 8
+Release:        %mkrel 9
 Summary:        Generic Programming for Computer Vision
 License:        MIT
 Group:          Development/C
-Source0:        http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/%{name}-%{version}-src.tar.gz
-URL:            http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/
-BuildRequires:  zlib-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libtiff-devel
-BuildRequires:  fftw-devel >= 3
-BuildRequires:  cmake
-BuildRequires:  hdf5-devel
-BuildRequires:  boost-devel
-BuildRequires:  doxygen
-BuildRequires:  python-sphinx
+URL:            http://ukoethe.github.io/vigra/
+Source0:        https://github.com/ukoethe/vigra/releases/download/Version-1-9-0/%{name}-%{version}-src.tar.gz
+
+BuildRequires:  cmake
+BuildRequires:  libjpeg-devel
+BuildRequires:  hdf5-devel
+BuildRequires:  boost-devel
+BuildRequires:  doxygen
+BuildRequires:  python-sphinx
 BuildRequires:  python-numpy-devel
+BuildRequires:  pkgconfig(fftw3)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libtiff-4)
+BuildRequires:  pkgconfig(python)
+BuildRequires:  pkgconfig(zlib)

 %description
 VIGRA stands for "Vision with Generic Algorithms". It's a novel computer vision
@@ -30,28 +32,40 @@
 Template Library, you can easily adapt any VIGRA component to the needs of your
 application without thereby giving up execution speed.

-%package devel
-Summary: Development tools for programs which will use the vigra library
-Group: Development/C
-Requires: vigra = %{version}-%{release}
-Requires: libjpeg-devel libtiff-devel libpng-devel zlib-devel fftw-devel >= 3
-Requires: hdf5-devel boost-devel python-sphinx python-numpy
+%package -n     %{libname}
+Summary:        Main library for %{name}
+Group:          System/Libraries
+Obsoletes:      %{name} < 1.9.0-9
+Provides:       %{name} = %{version}-%{release}

-%description devel
+%description -n %{libname}
+This package contains the library needed to run %{name}.
+
+%package -n     %{libnamedevel}
+Summary:        Development tools for programs which will use the %{name} library
+Group:          Development/C
+Requires:       %{libname} = %{version}-%{release}
+Provides:       lib%{name}-devel = %{version}-%{release}
+Provides:       %{name}-devel = %{version}-%{release}
+Obsoletes:      %{name}-devel < 1.9.0-9
+
+%description -n %{libnamedevel}
 The vigra-devel package includes the header files necessary for developing
-programs that use the vigra library.
+programs that use the %{name} library.

-%package python
-Summary: Python interface for the vigra computer vision library
-Group: Development/Python
-Requires: vigra = %{version}-%{release}
-Requires: python-numpy-devel
+%package -n     python-vigra
+Summary:        Python interface for the %{name} computer vision library
+Group:          Development/Python
+Requires:       %{libname} = %{version}-%{release}
+Requires:       python-numpy
+Obsoletes:      vigra-python < 1.9.0-9
+Provides:       vigra-python = %{version}-%{release}

-%description python
-The vigra-python package provides python bindings for vigra
+%description -n python-vigra
+The python-vigra package provides python bindings for %{name}.

 %prep
-%setup -q -n %{name}-%{version}
+%setup -q

 %build
 %cmake -DDOCINSTALL=share/doc/%{name}
@@ -63,16 +77,18 @@
 %install
 %makeinstall_std -C build

-%files
-%{_libdir}/libvigraimpex.so.*
+%files -n %{libname}
+%doc LICENSE.txt README.md
+%{_libdir}/libvigraimpex.so.%{major}
+%{_libdir}/libvigraimpex.so.%{major}.*

-%files devel
+%files -n %{libnamedevel}
 %doc %{_datadir}/doc/%{name}
-%{_bindir}/vigra-config
-%{_includedir}/vigra
+%{_bindir}/%{name}-config
+%{_includedir}/%{name}/
 %{_libdir}/libvigraimpex.so
-%{_libdir}/vigra
+%{_libdir}/%{name}/
 %doc doc/vigra doc/vigranumpy

-%files python
-%{python_sitearch}/vigra
+%files -n python-vigra
+%{python_sitearch}/%{name}/