Hello community, here is the log from the commit of package vigra for openSUSE:Factory checked in at 2012-09-23 17:11:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vigra (Old) and /work/SRC/openSUSE:Factory/.vigra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vigra", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/vigra/vigra.changes 2011-11-21 15:50:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vigra.new/vigra.changes 2012-09-23 17:12:07.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Sep 18 12:06:46 UTC 2012 - [email protected] + +- Update to version 1.8.0 + * See http://hci.iwr.uni-heidelberg.de/vigra/doc/vigra/CreditsChangelog.html +- Drop all the patches, fixed upstream. +- Fixed dependencies for the devel package. + +------------------------------------------------------------------- +Thu Sep 6 08:40:22 UTC 2012 - [email protected] + +- build also against libpng15 + * libpng15.patch + +------------------------------------------------------------------- Old: ---- vigra-config.patch vigra1.6.0-autoconf.patch vigra1.6.0-libpng14.patch vigra1.6.0.tar.bz2 New: ---- vigra-1.8.0-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vigra.spec ++++++ --- /var/tmp/diff_new_pack.kBvJfE/_old 2012-09-23 17:12:09.000000000 +0200 +++ /var/tmp/diff_new_pack.kBvJfE/_new 2012-09-23 17:12:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package vigra # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,21 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - +%define _shlibname libvigraimpex4 Name: vigra -BuildRequires: boost-devel fftw3-devel gcc-c++ libjpeg-devel libpng-devel libtiff-devel libtool pkg-config python-devel zlib-devel +BuildRequires: boost-devel +BuildRequires: cmake +BuildRequires: fftw3-devel +BuildRequires: gcc-c++ +%if 0%{?suse_version} >= 1220 +BuildRequires: hdf5-devel +%endif +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +%if 0%{?suse_version} > 1220 +BuildRequires: openexr-devel +%endif +BuildRequires: pkg-config +BuildRequires: python-devel +BuildRequires: zlib-devel +Summary: Computer vision Library License: MIT Group: Development/Libraries/C and C++ -AutoReqProv: on -Summary: Computer vision Library -Version: 1.6.0 -Release: 20 -Source: %{name}%{version}.tar.bz2 -Patch: vigra1.6.0-autoconf.patch -Patch1: vigra1.6.0-libpng14.patch -Patch2: vigra-config.patch +Version: 1.8.0 +Release: 0 +Source: http://hci.iwr.uni-heidelberg.de/vigra/vigra-%{version}-src.tar.gz Url: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,20 +51,13 @@ VIGRA component to the needs of your application, without giving up execution speed. - - -Authors: --------- - Ullrich Koethe <[email protected]> - -%package -n libvigraimpex2 -License: MIT -Group: Development/Libraries/C and C++ +%package -n %{_shlibname} Summary: Computer vision Library +Group: Development/Libraries/C and C++ Provides: %{name} = %{version} Obsoletes: %{name} < %{version} -%description -n libvigraimpex2 +%description -n %{_shlibname} VIGRA stands for "Vision with Generic Algorithms". It is a novel computer vision library that puts its main emphasis on customizable algorithms and data structures. By using template techniques similar to @@ -62,21 +65,22 @@ VIGRA component to the needs of your application, without giving up execution speed. - - -Authors: --------- - Ullrich Koethe <[email protected]> - %package devel -License: MIT -Group: Development/Libraries/C and C++ Summary: Development files for VIGRA Library -Requires: libvigraimpex2 = %{version} -Requires: glibc-devel +Group: Development/Libraries/C and C++ +Requires: %{_shlibname} = %{version} +Requires: fftw3-devel +%if 0%{?suse_version} >= 1220 +Requires: hdf5-devel +%endif +Requires: libjpeg-devel +Requires: libpng-devel Requires: libstdc++-devel Requires: libtiff-devel -Requires: fftw3-devel +%if 0%{?suse_version} > 1220 +Requires: openexr-devel +%endif +Requires: zlib-devel %description devel VIGRA stands for "Vision with Generic Algorithms". It is a novel @@ -86,62 +90,35 @@ VIGRA component to the needs of your application, without giving up execution speed. - - -Authors: --------- - Ullrich Koethe <[email protected]> - %prep -%setup -q -n %{name}%{version} -%patch -%patch1 -p1 -%patch2 +%setup -q %build -export vigra_srcdir=$PWD -%if %suse_version >= 1110 -cp -a config/configure.in config/acinclude.m4 . -rm config/libtool.m4 config/status.m4 config/aclocal.m4 -ACLOCAL="aclocal -I config" autoreconf -f -i -%configure\ -%else -CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --libdir=%{_libdir}\ +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DDOCINSTALL=%{_docdir} \ + -DWITH_HDF5=1 \ +%if %{_lib} == "lib64" + -DLIBDIR_SUFFIX=64 \ %endif - --disable-static --with-pic\ - --docdir=%{_docdir}/%{name}\ - --with-tiff\ - --with-jpeg\ - --with-png\ - --with-zlib\ - --with-fftw\ - --with-boostpython\ - CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" -make %{?jobs:-j%jobs} + .. + +make %{?_smp_mflags} %install -make install\ - libdir=$RPM_BUILD_ROOT/%{_libdir}\ - bindir=$RPM_BUILD_ROOT/%{_bindir}\ - docdir=$RPM_BUILD_ROOT/%{_docdir}/%{name}\ - includedir=$RPM_BUILD_ROOT/%{_includedir} -mkdir -p $RPM_BUILD_ROOT/%{_docdir}/libvigraimpex2 -mv $RPM_BUILD_ROOT/%{_docdir}/%{name}/LICENSE.txt $RPM_BUILD_ROOT/%{_docdir}/libvigraimpex2/ -cp -a README.txt $RPM_BUILD_ROOT/%{_docdir}/libvigraimpex2/ -%{__rm} -f %{buildroot}%{_libdir}/*.la +cd build +%makeinstall -%clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot}%{_docdir}/vigranumpy -%post -n libvigraimpex2 -p /sbin/ldconfig +%post -n %{_shlibname} -p /sbin/ldconfig -%postun -n libvigraimpex2 -p /sbin/ldconfig +%postun -n %{_shlibname} -p /sbin/ldconfig -%files -n libvigraimpex2 +%files -n %{_shlibname} %defattr(-,root,root) -%doc %dir %{_docdir}/libvigraimpex2 -%doc %{_docdir}/libvigraimpex2/LICENSE.txt -%doc %{_docdir}/libvigraimpex2/README.txt +%doc README.txt LICENSE.txt %{_libdir}/*.so.* %files devel @@ -149,10 +126,8 @@ %{_bindir}/vigra-config %{_libdir}/*.so %{_includedir}/* -%doc %dir %{_docdir}/%{name} -%doc %{_docdir}/%{name}/[a-z]* -%doc %{_docdir}/%{name}/[A-KM-QS-Z]* -%doc %{_docdir}/%{name}/RG* -%doc %{_docdir}/%{name}/Ra* +%dir %{_libdir}/vigra/ +%{_libdir}/vigra/*.cmake +%doc %{_docdir}/%{name} %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
