Author: emes Date: Sat Oct 31 22:15:38 2009 GMT Module: packages Tag: HEAD ---- Log message: - up to 2009.2.0 - enforce boost >= 1.40.0 and apply patch - hugin-pl.po-update.patch does not apply anymore
---- Files affected: packages/hugin: hugin.spec (1.40 -> 1.41) , hugin-boost-1.40-fix.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/hugin/hugin.spec diff -u packages/hugin/hugin.spec:1.40 packages/hugin/hugin.spec:1.41 --- packages/hugin/hugin.spec:1.40 Sun Sep 20 13:36:48 2009 +++ packages/hugin/hugin.spec Sat Oct 31 23:15:33 2009 @@ -2,18 +2,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 @@ -27,6 +28,7 @@ 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 @@ -54,9 +56,10 @@ %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 @@ -97,10 +100,12 @@ %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 @@ -108,20 +113,22 @@ %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/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -129,6 +136,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.41 2009/10/31 22:15:33 emes +- up to 2009.2.0 +- enforce boost >= 1.40.0 and apply patch +- hugin-pl.po-update.patch does not apply anymore + Revision 1.40 2009/09/20 11:36:48 hawk - release 5 ================================================================ Index: packages/hugin/hugin-boost-1.40-fix.patch diff -u /dev/null packages/hugin/hugin-boost-1.40-fix.patch:1.1 --- /dev/null Sat Oct 31 23:15:38 2009 +++ packages/hugin/hugin-boost-1.40-fix.patch Sat Oct 31 23:15:33 2009 @@ -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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hugin/hugin.spec?r1=1.40&r2=1.41&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
