- up to 2009.2.0

- enforce boost >= 1.40.0 and apply patch
- hugin-pl.po-update.patch does not apply anymore

Changed files:
    hugin-boost-1.40-fix.patch -> 1.1
    hugin.spec -> 1.41

diff --git a/hugin-boost-1.40-fix.patch b/hugin-boost-1.40-fix.patch
new file mode 100644 (file)
index 0000000..50c7625
--- /dev/null
+++ b/hugin-boost-1.40-fix.patch
@@ -0,0 +1,14 @@
+diff -NurbBp a/src/hugin_base/vigra_ext/ImageTransforms.h b/src/hugin_base/vigra_ext/ImageTransforms.h
+--- a/src/hugin_base/vigra_ext/ImageTransforms.h       2009-09-21 03:04:06.000000000 +0200
++++ b/src/hugin_base/vigra_ext/ImageTransforms.h       2009-09-26 16:33:10.000000000 +0200
+@@ -42,9 +42,7 @@
+ #include "MultiThreadOperations.h"
+ #include <boost/thread/thread.hpp>
+ #include <boost/bind.hpp>
+-#ifdef __APPLE__
+-    #include <boost/function.hpp>
+-#endif
++#include <boost/function.hpp>
+ 
+ 
+ namespace vigra_ext

diff --git a/hugin.spec b/hugin.spec
index dd6a7f27b99b463eaa57ec43376a427cc8efe777..921f56a6404a3064e7d0b4557725668fade0b329 100644 (file)
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,18 +1,19 @@
 Summary:       Toolchain to create panoramic images
 Summary(pl.UTF-8):     Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:          hugin
-Version:       0.7.0
-Release:       5
+Version:       2009.2.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       http://dl.sourceforge.net/hugin/%{name}-%{version}.tar.gz
-# Source0-md5: 6efbfc72ceba028ca3dff3c23806a7f3
+# Source0-md5: 856fa8016bc990874a71a19cc162f6be
 Patch0:                %{name}-pl.po-update.patch
 Patch1:                %{name}-asneeded.patch
 Patch2:                %{name}-cppflags.patch
+Patch3:                %{name}-boost-1.40-fix.patch
 URL:           http://hugin.sourceforge.net/
 BuildRequires: OpenEXR-devel
-BuildRequires: boost-devel >= 1.35.0
+BuildRequires: boost-devel >= 1.40.0
 BuildRequires: cmake >= 2.4
 BuildRequires: exiv2-devel
 BuildRequires: gettext-devel
@@ -26,6 +27,7 @@ BuildRequires:        pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.471
 BuildRequires: sed >= 4.0
 BuildRequires: wxGTK2-unicode-devel >= 2.6.0
+BuildRequires: wxGTK2-unicode-gl-devel >= 2.6.0
 BuildRequires: zip
 BuildRequires: zlib-devel
 Suggests:      autopano-sift-C >= 2.5.0
@@ -53,9 +55,10 @@ pakiety także zainstalować.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 mv -f src/translations/{ca_ES,ca}.po
 mv -f src/translations/{cs_CZ,cs}.po
@@ -96,10 +99,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog LICENCE_JHEAD LICENCE_VIGRA README TODO
+%doc AUTHORS ChangeLog LICENCE_VIGRA README TODO
 %lang(ja) %doc README_JP
 %attr(755,root,root) %{_bindir}/align_image_stack
 %attr(755,root,root) %{_bindir}/autooptimiser
+%attr(755,root,root) %{_bindir}/autopano-noop.sh
+%attr(755,root,root) %{_bindir}/celeste_standalone
 %attr(755,root,root) %{_bindir}/fulla
 %attr(755,root,root) %{_bindir}/hugin
 %attr(755,root,root) %{_bindir}/hugin_hdrmerge
@@ -107,17 +112,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/matchpoint
 %attr(755,root,root) %{_bindir}/nona
 %attr(755,root,root) %{_bindir}/nona_gui
+%attr(755,root,root) %{_bindir}/PTBatcher
+%attr(755,root,root) %{_bindir}/PTBatcherGUI
 %attr(755,root,root) %{_bindir}/pto2mk
 %attr(755,root,root) %{_bindir}/tca_correct
 %attr(755,root,root) %{_bindir}/vig_optimize
+%attr(755,root,root) %{_libdir}/libceleste.so*
 %attr(755,root,root) %{_libdir}/libhuginANN.so.*.*
 %attr(755,root,root) %{_libdir}/libhuginbase.so.*.*
-%attr(755,root,root) %{_libdir}/libhuginjhead.so.*.*
 %attr(755,root,root) %{_libdir}/libhuginvigraimpex.so.*.*
 %{_datadir}/%{name}
 %{_datadir}/mime/packages/hugin.xml
 %{_desktopdir}/hugin.desktop
-%{_desktopdir}/hugin_stitch_project.desktop
+%{_desktopdir}/PTBatcherGUI.desktop
 %{_iconsdir}/hicolor/*/mimetypes/gnome-mime-application-x-ptoptimizer-script.png
 %{_pixmapsdir}/hugin.png
-%{_mandir}/man1/fulla.1*
+%{_mandir}/man1/*