[hugin] Upstream release. New features, and fixes a critical crashing bug on multiprocessor systems

[bpostle]

commit 5dbf84d3310e5a8e6f68c0954dc38b66648b23bf
Author: Bruno Postle <bruno at postle.net>
Date:   Sun Oct 2 22:41:34 2011 +0100

    Upstream release.  New features, and fixes a critical crashing bug on multiprocessor systems

 hugin.spec |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)
---
diff --git a/hugin.spec b/hugin.spec
index dfeecd5..a197da4 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,10 +1,12 @@
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 Summary: A panoramic photo stitcher and more
 Name: hugin
-Version: 2011.0.0
-Release: 3%{?dist}
+Version: 2011.2.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
+Patch0: hugin-2011.2.0.tclap.diff
 URL: http://hugin.sourceforge.net/
 Requires: shared-mime-info
 Requires: webclient
@@ -12,24 +14,24 @@ Requires: %{name}-base = %{version}-%{release}
 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: python-devel swig
 %{?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
 span 360 degrees. Another common use is the creation of very high resolution
-pictures by combining multiple images.  It uses the Panorama Tools as backend
+pictures by combining multiple images. It uses the Panorama Tools as back-end
 to create high quality images
 
 %package base
 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
-Provides: bundles(flann) = 1.6.6
+Provides: bundled(flann) = 1.6.6
 
 %description base
 Command-line tools used to generate panoramic images, install this package
@@ -38,9 +40,10 @@ without a GUI environment.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%cmake .
+%cmake . -DBUILD_HSI=1
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
@@ -79,17 +82,25 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_bindir}/hugin_stitch_project
 %{_bindir}/nona_gui
 %{_bindir}/icpfind
+%{_bindir}/calibrate_lens_gui
 %{_bindir}/autopano-noop.sh
 %{_libdir}/%{name}/libhuginbasewx.so*
 %{_libdir}/%{name}/libicpfindlib.so*
 %{_datadir}/%{name}/xrc
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/PTBatcherGUI.desktop
+%{_datadir}/applications/calibrate_lens_gui.desktop
 %{_datadir}/pixmaps/*.png
 %{_datadir}/icons/gnome/48x48/mimetypes/*
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/%{name}/data/default.setting
+%{_datadir}/%{name}/data/plugins/README_*.txt
+%{_datadir}/%{name}/data/plugins/*.py*
+%{_datadir}/%{name}/data/plugins-templates/*.py*
+%{_mandir}/man1/PTBatcher.*
 %{_mandir}/man1/PTBatcherGUI.*
+%{_mandir}/man1/autopano-noop.*
+%{_mandir}/man1/calibrate_lens_gui.*
 %{_mandir}/man1/hugin.*
 %{_mandir}/man1/hugin_stitch_project.*
 %{_mandir}/man1/nona_gui.*
@@ -109,7 +120,6 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_bindir}/pto2mk
 %{_bindir}/tca_correct
 %{_bindir}/vig_optimize
-%{_bindir}/calibrate_lens
 %{_bindir}/cpclean
 %{_bindir}/deghosting_mask
 %{_bindir}/pano_trafo
@@ -118,22 +128,27 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_bindir}/checkpto
 %{_bindir}/cpfind
 
-%{_libdir}/%{name}/libhuginANN.so*
 %{_libdir}/%{name}/libhuginbase.so*
 %{_libdir}/%{name}/libhuginvigraimpex.so*
 %{_libdir}/%{name}/libceleste.so*
 %{_libdir}/%{name}/liblocalfeatures.so*
 %{_libdir}/%{name}/libmakefilelib.so*
 %{_libdir}/%{name}/libflann_cpp.so*
+%{_libdir}/%{name}/libhuginlines.so*
+%{_libdir}/%{name}/libhugin_python_interface.so*
+%{python_sitearch}/_hsi.so
+%{python_sitearch}/hsi.py*
+%{python_sitearch}/hpi.py*
+
 %{_datadir}/%{name}/Makefile.*.mk
 %{_datadir}/%{name}/data/celeste.model
 %{_mandir}/man1/align_image_stack.*
 %{_mandir}/man1/autooptimiser.*
-%{_mandir}/man1/calibrate_lens.*
 %{_mandir}/man1/cpclean.*
 %{_mandir}/man1/celeste_standalone.*
 %{_mandir}/man1/fulla.*
 %{_mandir}/man1/hugin_hdrmerge.*
+%{_mandir}/man1/matchpoint.*
 %{_mandir}/man1/nona.*
 %{_mandir}/man1/pto2mk.*
 %{_mandir}/man1/tca_correct.*
@@ -146,6 +161,9 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_mandir}/man1/cpfind.*
 
 %changelog
+* Fri Sep 30 2011 Bruno Postle 2011.2.0-1
+- upstream release. tclap patch ported forward from 2011.0.0, see bug #683591
+
 * Sun Jul 24 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 2011.0.0-3
 - Rebuilt for boost 1.47.0 soname bump