From 69c19f1ebc7e21c6f26b53c9df1333f86355aa55 Mon Sep 17 00:00:00 2001
From: Bruno Postle <bruno@postle.net>
Date: Wed, 12 Jan 2011 22:17:04 +0000
Subject: [PATCH] Update to upstream 2010.4.0 release

---
 .gitignore |  1 +
 hugin.spec | 40 +++++++++++++++++++++++++++-------------
 sources    |  2 +-
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index b399242..daa2063 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ hugin-*.src.rpm
 clog
 .build*
 
+/hugin-2010.4.0.tar.bz2
diff --git a/hugin.spec b/hugin.spec
index f77f5ea..8ae5b15 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,15 +1,15 @@
 Summary: A panoramic photo stitcher and more
 Name: hugin
-Version: 2010.2.0
-Release: 2%{?dist}
+Version: 2010.4.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
-Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.gz
+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.14 zlib-devel libtiff-devel libjpeg-devel
+BuildRequires: libpano13-devel >= 2.9.17 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
 %{?fedora:BuildRequires: mesa-libGLU-devel libXmu-devel}
@@ -25,6 +25,10 @@ to create high quality images
 Summary: Command-line tools and libraries required by hugin
 Group: Applications/Multimedia
 Requires: make enblend >= 3.2 perl-Image-ExifTool
+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
 
 %description base
 Command-line tools used to generate panoramic images, install this package
@@ -41,12 +45,6 @@ make VERBOSE=1 %{?_smp_mflags}
 %install
 make install DESTDIR=%{buildroot}
 
-# unused symlinks
-rm %{buildroot}/%{_libdir}/libhuginbase.so
-rm %{buildroot}/%{_libdir}/libhuginANN.so
-rm %{buildroot}/%{_libdir}/libhuginvigraimpex.so
-rm %{buildroot}/%{_libdir}/libceleste.so
-
 desktop-file-install --vendor="" --delete-original \
   --dir=%{buildroot}/%{_datadir}/applications \
   %{buildroot}/%{_datadir}/applications/%{name}.desktop
@@ -79,17 +77,22 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_bindir}/hugin
 %{_bindir}/hugin_stitch_project
 %{_bindir}/nona_gui
+%{_bindir}/icpfind
 %{_bindir}/autopano-noop.sh
+%{_libdir}/%{name}/libhuginbasewx.so*
+%{_libdir}/%{name}/libicpfindlib.so*
 %{_datadir}/%{name}/xrc
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/PTBatcherGUI.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/*.png
 %{_datadir}/icons/gnome/48x48/mimetypes/*
 %{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/%{name}/data/default.setting
 %{_mandir}/man1/PTBatcherGUI.*
 %{_mandir}/man1/hugin.*
 %{_mandir}/man1/hugin_stitch_project.*
 %{_mandir}/man1/nona_gui.*
+%{_mandir}/man1/icpfind.*
 
 %doc AUTHORS COPYING INSTALL_cmake README README_JP TODO LICENCE_VIGRA src/celeste/LICENCE_LIBSVM doc/nona.txt doc/fulla.html src/hugin1/hugin/xrc/data/help_en_EN/LICENCE.manual
 
@@ -111,9 +114,15 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_bindir}/pano_trafo
 %{_bindir}/pano_modify
 %{_bindir}/pto_merge
+%{_bindir}/checkpto
+%{_bindir}/cpfind
 
-%{_libdir}/libhugin*
-%{_libdir}/libceleste*
+%{_libdir}/%{name}/libhuginANN.so*
+%{_libdir}/%{name}/libhuginbase.so*
+%{_libdir}/%{name}/libhuginvigraimpex.so*
+%{_libdir}/%{name}/libceleste.so*
+%{_libdir}/%{name}/liblocalfeatures.so*
+%{_libdir}/%{name}/libmakefilelib.so*
 %{_datadir}/%{name}/Makefile.*.mk
 %{_datadir}/%{name}/data/celeste.model
 %{_mandir}/man1/align_image_stack.*
@@ -131,8 +140,13 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_mandir}/man1/pano_trafo.*
 %{_mandir}/man1/pano_modify.*
 %{_mandir}/man1/pto_merge.*
+%{_mandir}/man1/checkpto.*
+%{_mandir}/man1/cpfind.*
 
 %changelog
+* Wed Jan 12 2011 Bruno Postle <bruno@postle.net> - 2010.4.0-1
+- Upstream release (2010.4.0)
+
 * Sun Jan 02 2011 Rex Dieter <rdieter@fedoraproject.org> - 2010.2.0-2
 - rebuild (exiv2)
 
diff --git a/sources b/sources
index 330a2b9..a6beb30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be94c0454924ff5b7dbea4736395f7b1  hugin-2010.2.0.tar.gz
+bfd716655461987312b2f2f00c90dcc5  hugin-2010.4.0.tar.bz2