- release 2 (by relup.sh)

[packages/vigra.git] / vigra.spec

diff --git a/vigra.spec b/vigra.spec
index 7142ff76852f2e05d89fb1306edc6d8045513e95..952a58439c1d88b1815ddbea26711a6bd8c3fdb6 100644 (file)
--- a/vigra.spec
+++ b/vigra.spec
@@ -1,24 +1,28 @@
 Summary:       Generic Programming for Computer Vision
 Summary:       Generic Programming for Computer Vision

-Summary(pl):   Ogólne programowanie obrazu komputerowego
+Summary(pl.UTF-8):     Ogólne programowanie obrazu komputerowego

 Name:          vigra
 Name:          vigra

-Version:       1.4.0
-Release:       1
-License:       The VIGRA Artistic License
+Version:       1.9.0
+Release:       2
+License:       MIT

 Group:         Libraries
 Group:         Libraries

-Source0:       http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/%{name}%{version}.tar.gz
-# Source0-md5: ea91f2fb4212a21d708aced277e6e85a
-Patch0:                %{name}-ac.patch
-URL:           http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: fftw3-devel
+Source0:       http://hci.iwr.uni-heidelberg.de/vigra/%{name}-%{version}-src.tar.gz
+# Source0-md5: b6155afe1ea967917d2be16d98a85404
+URL:           http://hci.iwr.uni-heidelberg.de/vigra/
+BuildRequires: boost-python-devel >= 1.40.0
+BuildRequires: cmake >= 2.6.0
+BuildRequires: doxygen
+BuildRequires: fftw3-single-devel
+BuildRequires: hdf5-devel >= 1.8

 BuildRequires: libjpeg-devel
 BuildRequires: libjpeg-devel

-BuildRequires: libpng-devel
+BuildRequires: libpng-devel >= 1.4.0

 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel

-BuildRequires: libtool >= 2:1.5
-#BuildRequires:        python
-#BuildRequires:        python-devel
+BuildRequires: pkgconfig
+BuildRequires: python
+BuildRequires: python-devel
+BuildRequires: python-numpy-devel
+BuildRequires: rpmbuild(macros) >= 1.586
+BuildRequires: sphinx-pdg

 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -30,75 +34,66 @@ to those in the C++ Standard Template Library, you can easily adapt
 any VIGRA component to the needs of your application, without thereby
 giving up execution speed.
 
 any VIGRA component to the needs of your application, without thereby
 giving up execution speed.
 

-%description -l pl
-VIGRA to skrót od "Vision with Generic Algorithms" (widok z ogólnymi
-algorytmami). Jest to nowa biblioteka do obrazu komputerowego k³ad±ca
-g³ówny nacisk na algorytmy i struktury danych z mo¿liwo¶ci±
-dostosowania do w³asnych potrzeb. Poprzez u¿ycie technik szablonów
-podobnych do tych w standardowej bibliotece szablonów C++ (STL) mo¿na
-³atwo zaadaptowaæ dowolny komponent VIGRA do potrzeb w³asnej aplikacji
-bez po¶wiêcania szybko¶ci wykonywania.
+%description -l pl.UTF-8
+VIGRA to skrót od "Vision with Generic Algorithms" (widok z ogólnymi
+algorytmami). Jest to nowa biblioteka do obrazu komputerowego kładąca
+główny nacisk na algorytmy i struktury danych z możliwością
+dostosowania do własnych potrzeb. Poprzez użycie technik szablonów
+podobnych do tych w standardowej bibliotece szablonów C++ (STL) można
+łatwo zaadaptować dowolny komponent VIGRA do potrzeb własnej aplikacji
+bez poświęcania szybkości wykonywania.

 
 %package devel
 Summary:       Header files for vigra library
 
 %package devel
 Summary:       Header files for vigra library

-Summary(pl):   Pliki nag³ówkowe biblioteki vigra
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki vigra

 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}

+Requires:      fftw3-single-devel
+Requires:      hdf5-devel >= 1.8

 Requires:      libjpeg-devel
 Requires:      libpng-devel
 Requires:      libstdc++-devel
 Requires:      libtiff-devel
 Requires:      libjpeg-devel
 Requires:      libpng-devel
 Requires:      libstdc++-devel
 Requires:      libtiff-devel

+Obsoletes:     vigra-static

 
 %description devel
 Header files needed to compile programs with vigra.
 
 
 %description devel
 Header files needed to compile programs with vigra.
 

-%description devel -l pl
-Pliki nag³ówkowe potrzebne do budowania programów u¿ywaj±cych
+%description devel -l pl.UTF-8
+Pliki nagłówkowe potrzebne do budowania programów używających

 biblioteki vigra.
 
 biblioteki vigra.
 

-%package static
-Summary:       vigra - static library
-Summary(pl):   Statyczna biblioteka vigra
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
+%package -n python-vigra
+Summary:       VIGRA Python bindings
+Summary(pl.UTF-8):     Wiązania Pythona do biblioteki VIGRA
+Group:         Libraries/Python
+Requires:      %{name} = %{version}-%{release}
+Requires:      python-numpy
+Suggests:      python-PyQt4

 
 

-%description static
-Static version of vigra library.
+%description -n python-vigra
+VIGRA Python bindings.

 
 

-%description static -l pl
-Statyczna wersja biblioteki vigra.
+%description -n python-vigra -l pl.UTF-8
+Wiązania Pythona do biblioteki VIGRA.

 
 %package doc
 Summary:       Development documentation for vigra library
 
 %package doc
 Summary:       Development documentation for vigra library

-Summary(pl):   Dokumentacja programisty do biblioteki vigra
+Summary(pl.UTF-8):     Dokumentacja programisty do biblioteki vigra

 Group:         Documentation
 
 %description doc
 Development documentation for vigra library.
 
 Group:         Documentation
 
 %description doc
 Development documentation for vigra library.
 

-%description doc -l pl
+%description doc -l pl.UTF-8

 Dokumentacja programisty do biblioteki vigra.
 
 %prep
 Dokumentacja programisty do biblioteki vigra.
 
 %prep

-%setup -q -n %{name}%{version}
-%patch0 -p1
-
-tail -n +510 config/acinclude.m4 > acinclude.m4
-ln -sf config/configure.in .
+%setup -q

 
 %build
 
 %build

-cp -f /usr/share/automake/config.* config
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%configure \
-       --with-fftw \
-       --with-jpeg \
-       --with-png \
-       --with-tiff \
-       --with-zlib
-
-#      --with-python requires src/pythonbindings (missing in sources)
+%cmake . \
+       -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG"

 
 %{__make}
 
 
 %{__make}
 


@@ -106,11 +101,13 @@ cp -f /usr/share/automake/config.* config
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \

-       prefix=$RPM_BUILD_ROOT%{_prefix} \
-       exec-prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-       bindir=$RPM_BUILD_ROOT%{_bindir} \
-       includedir=$RPM_BUILD_ROOT%{_includedir} \
-       libdir=$RPM_BUILD_ROOT%{_libdir}
+       DESTDIR=$RPM_BUILD_ROOT
+
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}/vigra
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/vigra
+%py_postclean
+
+%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/doc/vigra*

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -120,20 +117,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc LICENSE README
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%doc LICENSE.txt README.txt
+%attr(755,root,root) %{_libdir}/libvigraimpex.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvigraimpex.so.4

 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/vigra-config
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/vigra-config

-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libvigraimpex.so

 %{_includedir}/vigra
 %{_includedir}/vigra

+%dir %{_libdir}/vigra
+%{_libdir}/vigra/VigraConfig*.cmake
+%{_libdir}/vigra/vigra-targets*.cmake

 
 

-%files static
+%files -n python-vigra

 %defattr(644,root,root,755)
 %defattr(644,root,root,755)

-%{_libdir}/lib*.a
+%dir %{py_sitedir}/vigra
+%attr(755,root,root) %{py_sitedir}/vigra/*.so
+%{py_sitedir}/vigra/*.py[co]
+%dir %{py_sitedir}/vigra/pyqt
+%{py_sitedir}/vigra/pyqt/*.py[co]

 
 %files doc
 %defattr(644,root,root,755)
 
 %files doc
 %defattr(644,root,root,755)

-%doc @docdir@/[!L]*
+%doc doc/{vigra,vigranumpy}