sync newer bits from F-12 branch, fix upgrade path

.cvsignore

@@ -1 +1 @@
-hugin-0.8.0.tar.gz
+hugin-2009.2.0.tar.gz

hugin.spec

@@ -1,7 +1,7 @@
 Summary: A panoramic photo stitcher and more
 Name: hugin
-Version: 0.8.0
-Release: 3%{?dist}
+Version: 2009.2.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.gz
@@ -12,6 +12,14 @@ Requires: %{name}-base = %{version}-%{release}
 BuildRequires: libpano13-devel >= 2.9.14 zlib-devel libtiff-devel libjpeg-devel
 BuildRequires: libpng-devel gettext-devel wxGTK-devel >= 2.7.0 boost-devel
 BuildRequires: cmake desktop-file-utils OpenEXR-devel exiv2-devel glew-devel
+BuildRequires: freeglut-devel
+
+%if 0%{?fedora} >= 9
+BuildRequires: mesa-libGLU-devel libXmu-devel
+%endif
+%if 0%{?rhl} >= 4
+BuildRequires: xorg-x11-devel
+%endif
 
 %description
 hugin can be used to stitch multiple images together. The resulting image can
@@ -31,9 +39,6 @@ without a GUI environment.
 
 %prep
 %setup -q
-# replace autopano-sift default with info message
-sed -i 's/"autopano-sift-c"/"autopano-noop.sh"/' \
-       src/hugin1/hugin/config_defaults.h
 
 %build
 %cmake .
@@ -42,7 +47,6 @@ make VERBOSE=1 %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-install -m 0755 utils/autopano-noop.sh %{buildroot}/%{_bindir}/
 
 # unused symlinks
 rm %{buildroot}/%{_libdir}/libhuginbase.so
@@ -81,7 +85,6 @@ touch --no-create %{_datadir}/icons/gnome || :
 %defattr(-, root, root,-)
 %{_bindir}/PTBatcher
 %{_bindir}/PTBatcherGUI
-%{_bindir}/celeste_standalone
 %{_bindir}/hugin
 %{_bindir}/hugin_stitch_project
 %{_bindir}/nona_gui
@@ -92,18 +95,18 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/icons/gnome/48x48/mimetypes/*
 %{_datadir}/mime/packages/%{name}.xml
-%{_mandir}/man1/PTBatcherGUI.1.gz
-%{_mandir}/man1/celeste_standalone.1.gz
-%{_mandir}/man1/hugin.1.gz
-%{_mandir}/man1/hugin_stitch_project.1.gz
-%{_mandir}/man1/nona_gui.1.gz
+%{_mandir}/man1/PTBatcherGUI.*
+%{_mandir}/man1/hugin.*
+%{_mandir}/man1/hugin_stitch_project.*
+%{_mandir}/man1/nona_gui.*
 
-%doc AUTHORS COPYING INSTALL_cmake LICENCE README README_JP TODO LICENCE_JHEAD LICENCE_VIGRA doc/nona.txt doc/fulla.html src/hugin1/hugin/xrc/data/help_en_EN/LICENCE.manual
+%doc AUTHORS COPYING INSTALL_cmake README README_JP TODO LICENCE_VIGRA doc/nona.txt doc/fulla.html src/hugin1/hugin/xrc/data/help_en_EN/LICENCE.manual
 
 %files base
 %defattr(-, root, root,-)
 %{_bindir}/align_image_stack
 %{_bindir}/autooptimiser
+%{_bindir}/celeste_standalone
 %{_bindir}/fulla
 %{_bindir}/hugin_hdrmerge
 %{_bindir}/matchpoint
@@ -111,22 +114,24 @@ touch --no-create %{_datadir}/icons/gnome || :
 %{_bindir}/pto2mk
 %{_bindir}/tca_correct
 %{_bindir}/vig_optimize
+
 %{_libdir}/libhugin*
 %{_libdir}/libceleste*
-%{_datadir}/%{name}
 %{_datadir}/%{name}/Makefile.*.mk
-%{_mandir}/man1/align_image_stack.1.gz
-%{_mandir}/man1/autooptimiser.1.gz
-%{_mandir}/man1/fulla.1.gz
-%{_mandir}/man1/hugin_hdrmerge.1.gz
-%{_mandir}/man1/nona.1.gz
-%{_mandir}/man1/pto2mk.1.gz
-%{_mandir}/man1/tca_correct.1.gz
-%{_mandir}/man1/vig_optimize.1.gz
+%{_datadir}/%{name}/data/celeste.model
+%{_mandir}/man1/align_image_stack.*
+%{_mandir}/man1/autooptimiser.*
+%{_mandir}/man1/celeste_standalone.*
+%{_mandir}/man1/fulla.*
+%{_mandir}/man1/hugin_hdrmerge.*
+%{_mandir}/man1/nona.*
+%{_mandir}/man1/pto2mk.*
+%{_mandir}/man1/tca_correct.*
+%{_mandir}/man1/vig_optimize.*
 
 %changelog
-* Mon Jan 04 2010 Rex Dieter <rdieter@fedoraproject.org> 0.8.0-3 
-- rebuild (exiv2)
+* Tue Oct 20 2009 Bruno Postle <bruno@postle.net> 2009.2.0-1
+- 2009.2.0 release
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

sources

@@ -1 +1 @@
-0c88afbd7f8159aac29404ff40370400  hugin-0.8.0.tar.gz
+856fa8016bc990874a71a19cc162f6be  hugin-2009.2.0.tar.gz