From 69758f602d649cd6c5f20da5e972100cb38a0def Mon Sep 17 00:00:00 2001
From: bpostle <bpostle@fedoraproject.org>
Date: Jun 08 2009 22:11:28 +0000
Subject: Update to upstream 1.6.0 release


---

diff --git a/.cvsignore b/.cvsignore
index a4a7694..ece18b1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-vigra1.5.0.tar.gz
+vigra1.6.0.tar.gz
diff --git a/sources b/sources
index 55ac5e2..947bbc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5713de4ebfe29e1b5fa9689af76b8a90  vigra1.5.0.tar.gz
+d62650a6f908e85643e557a236ea989c  vigra1.6.0.tar.gz
diff --git a/vigra.spec b/vigra.spec
index 9275071..9bb3988 100644
--- a/vigra.spec
+++ b/vigra.spec
@@ -1,13 +1,14 @@
-Summary: Generic Programming for Computer Vision
-Name: vigra
-Version: 1.5.0
-Release: 5%{?dist}
-License: MIT
-Group: Development/Libraries
-Source: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/%{name}%{version}.tar.gz
-URL: http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: zlib-devel, libjpeg-devel, libpng-devel, libtiff-devel, fftw-devel >= 3
+Summary:        Generic Programming for Computer Vision
+Name:           vigra
+Version:        1.6.0
+Release:        1%{?dist}
+License:        MIT
+Group:          Development/Libraries
+Source:         http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/%{name}%{version}.tar.gz
+URL:            http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  zlib-devel libjpeg-devel libpng-devel libtiff-devel
+BuildRequires:  fftw3-devel
 
 %description
 VIGRA stands for "Vision with Generic Algorithms". It's a novel computer vision
@@ -17,10 +18,11 @@ 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/Libraries
-Requires: vigra = %{version}-%{release}
-Requires: libjpeg-devel, libtiff-devel, libpng-devel, zlib-devel, fftw-devel >= 3
+Summary:        Development tools for programs which will use the vigra library
+Group:          Development/Libraries
+Requires:       vigra = %{version}-%{release}
+Requires:       libjpeg-devel libtiff-devel libpng-devel zlib-devel
+Requires:       fftw3-devel
 
 %description devel
 The vigra-devel package includes the header files necessary for developing
@@ -28,8 +30,6 @@ programs that use the vigra library.
 
 %prep
 %setup -q -n %{name}%{version}
-chmod 644 %{_builddir}/%{name}%{version}/doc/vigra/documents/*.ps
-rm -f %{_builddir}/%{name}%{version}/doc/vigra/.cvsignore
 
 %build
 export CXXFLAGS="$RPM_OPT_FLAGS"
@@ -67,9 +67,12 @@ rm -rf %{buildroot}
 %{_bindir}/vigra-config
 %{_includedir}/vigra
 %{_libdir}/libvigraimpex.so
-%doc doc/vigra/*
+%doc doc/vigra/*.html doc/vigra/*.css doc/vigra/*.png doc/vigra/*.gif doc/vigra/*.ps doc/vigra/documents/
 
 %changelog
+* Mon Jun 08 2009 Bruno Postle - 1.6.0-1
+- Update to latest release
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -83,37 +86,7 @@ rm -rf %{buildroot}
   - update to 1.5.0 release
   - fix bug 228926: vigra: $RPM_OPT_FLAGS not used
 
-* Tue Sep 12 2006 Bruno Postle <bruno@postle.net> 1.4.0-4
-  - remove gcc-c++ dependency
-
-* Fri Sep 08 2006 Bruno Postle <bruno@postle.net> 1.4.0-3
-  - change defattr
-  - require fftw >= 3, gcc-c++
-
-* Tue Sep 05 2006 Bruno Postle <bruno@postle.net> 1.4.0-2
-  - update with review feedback
-
-* Mon Aug 28 2006 Bruno Postle <bruno@postle.net> 1.4.0-1
-  - revive, update to 1.4 with new license, remove patches, 
-  - split to devel package
-
-* Fri Jul 02 2004 Bruno Postle <bruno@postle.net>
-  - add pablo's vigra_typetraits_extension.diff patch and shorten
-    the impex patch so it doesn't conflict
-
-* Wed May 05 2004 Bruno Postle <bruno@postle.net>
-  - new build with patches for 16bit tiff and viff bug
-
-* Sun Feb 08 2004 Bruno Postle <bruno@postle.net>
-  - new build with shared libraries
-
-* Wed Jan 04 2004 Bruno Postle <bruno@postle.net>
-  - new build without shared libraries
-
-* Tue Nov 25 2003 Bruno Postle <bruno@postle.net>
-  - new build with shared libraries
-
 * Sun Nov 23 2003 Bruno Postle <bruno@postle.net>
-  - make a horrible mess
+  - initial package