From 3d00fd90c5757116a2f430a16cbd33113098e23d Mon Sep 17 00:00:00 2001
From: Bruno Postle <bruno@postle.net>
Date: Tue, 31 May 2011 01:07:16 +0100
Subject: [PATCH] New upstream release, gcc-4.6.0 patch no longer required

---
 hugin.spec | 16 ++++++++++------
 sources    |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/hugin.spec b/hugin.spec
index 932f0d3..80b042d 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,19 +1,19 @@
 Summary: A panoramic photo stitcher and more
 Name: hugin
-Version: 2010.4.0
-Release: 5%{?dist}
+Version: 2011.0.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
-Patch1: hugin-2010.4.0.gcc460.patch
 Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
 URL: http://hugin.sourceforge.net/
 Requires: shared-mime-info
 Requires: webclient
 Requires: %{name}-base = %{version}-%{release}
-BuildRequires: libpano13-devel >= 2.9.17 zlib-devel libtiff-devel libjpeg-devel
+BuildRequires: libpano13-devel >= 2.9.18 zlib-devel libtiff-devel libjpeg-devel
 BuildRequires: libpng-devel gettext-devel wxGTK-devel >= 2.7.0 boost-devel freeglut-devel
 BuildRequires: cmake desktop-file-utils OpenEXR-devel exiv2-devel glew-devel
-BuildRequires: mesa-libGLU-devel libXmu-devel
+%{?fedora:BuildRequires: mesa-libGLU-devel libXmu-devel}
+%{?rhel:BuildRequires: xorg-x11-devel}
 
 %description
 hugin can be used to stitch multiple images together. The resulting image can
@@ -29,6 +29,7 @@ Provides: bundled(ann-libs) = 1.1.1
 Provides: bundled(tclap) = 1.2.0
 Provides: bundled(vigra) = 1.5.0
 Provides: bundled(zthread) = 2.3.1
+Provides: bundles(flann) = 1.6.6
 
 %description base
 Command-line tools used to generate panoramic images, install this package
@@ -37,7 +38,6 @@ without a GUI environment.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %cmake .
@@ -124,6 +124,7 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_libdir}/%{name}/libceleste.so*
 %{_libdir}/%{name}/liblocalfeatures.so*
 %{_libdir}/%{name}/libmakefilelib.so*
+%{_libdir}/%{name}/libflann_cpp.so*
 %{_datadir}/%{name}/Makefile.*.mk
 %{_datadir}/%{name}/data/celeste.model
 %{_mandir}/man1/align_image_stack.*
@@ -145,6 +146,9 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_mandir}/man1/cpfind.*
 
 %changelog
+* Mon May 30 2011 Bruno Postle 2011.0.0-1
+- upstream release
+
 * Sun Apr 17 2011 Kalev Lember <kalev@smartlink.ee> - 2010.4.0-5
 - Rebuilt for boost 1.46.1 soname bump
 
diff --git a/sources b/sources
index a6beb30..f534042 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfd716655461987312b2f2f00c90dcc5  hugin-2010.4.0.tar.bz2
+ac8a129b4c3021233df6d9368c8164cf  hugin-2011.0.0.tar.bz2