X-Git-Url: http://git.pld-linux.org/?p=packages%2Fhugin.git;a=blobdiff_plain;f=hugin.spec;h=c9cb17e67ea0be686470a59c90d2f654d60ea097;hp=a6e7f20929729861ad475670dbf61a6bd07b5213;hb=c4b4991593968417b588cdddb2096ef926a1dcd3;hpb=b47f39abfeb962f5323ad95aa071a2f4fe367371

diff --git a/hugin.spec b/hugin.spec
index a6e7f20..c9cb17e 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,32 +1,35 @@
 Summary:	Toolchain to create panoramic images
 Summary(pl):	Zestaw narzêdzi do tworzenia panoramicznych zdjêæ
 Name:		hugin
-Version:	0.5
-Release:	2
+Version:	0.6
+Release:	1
 License:	GPL v2+
 Group:		Applications/Graphics
-Source0:	http://dl.sourceforge.net/hugin/%{name}-%{version}.tar.gz
-# Source0-md5:	18b38f5d6744831567b7fabfedb643fd
+Source0:	http://dl.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
+# Source0-md5:	a6ca2308a2ce78edd304f85cd2a06d58
 Patch0:		%{name}-pl.po-update.patch
 Patch1:		%{name}-defaults.patch
-Patch2:		%{name}-gcc4.patch
+Patch2:		%{name}-asneeded.patch
 URL:		http://hugin.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	boost-any-devel
-BuildRequires:	boost-ref-devel
-BuildRequires:	boost-test-devel
+BuildRequires:	boost-any-devel >= 1.31
+BuildRequires:	boost-ref-devel >= 1.31
+BuildRequires:	boost-test-devel >= 1.31
+BuildRequires:	boost-thread-devel >= 1.31
 BuildRequires:	gettext-devel
 BuildRequires:	gtk+2-devel >= 2.0.3
 BuildRequires:	libjpeg-devel
-BuildRequires:	libpano12-devel
+BuildRequires:	libpano12-devel >= 2.8.1
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	sed >= 4.0
 BuildRequires:	wxGTK2-devel >= 2.6.0
+BuildRequires:	zip
 BuildRequires:	zlib-devel
+Requires:	libpano12 >= 2.8.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,7 +45,7 @@ too.
 Przy u¿yciu hugina mo¿na po³±czyæ wiele fotografii w kompletn±, du¿±
 panoramê, skleiæ dowolny ci±g nak³adaj±cych siê zdjêæ i wiele wiêcej.
 
-Hugin mo¿e u¿ywaæ pakietu autopano-shift do dopasowania zdjêæ oraz
+Hugin mo¿e u¿ywaæ pakietu autopano-sift do dopasowania zdjêæ oraz
 pakiet enblend do wyg³adzenia krawêdzi po ³±czeniu - wiêc warto te
 pakiety tak¿e zainstalowaæ.
 
@@ -52,13 +55,18 @@ pakiety tak
 %patch1 -p1
 %patch2 -p1
 
-sed -i -e 's,ac_boost_libdir=.*/lib.*,ac_boost_libdir=/usr/%{_lib},' m4/ax_check_boost.m4
-
-# to rebuild pl.gmo
-rm -f src/hugin/po/stamp-po
+sed -i -e 's,/lib",/%{_lib}",' m4/ax_boost.m4
+sed -i -e 's/ca_ES/ca/;s/cs_CZ/cs/;' src/hugin/po/LINGUAS
+mv -f src/hugin/po/{ca_ES,ca}.po
+mv -f src/hugin/po/{cs_CZ,cs}.po
+# missing in LINGUAS
+echo 'cs'>> src/nona_gui/po/LINGUAS
+mv -f src/nona_gui/po/{cs_CZ,cs}.po
 
 %build
 %{__gettextize}
+cp -f po/Makefile.in.in src/hugin/po
+cp -f po/Makefile.in.in src/nona_gui/po
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -74,8 +82,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_datadir}/locale/{ca_ES,ca}
-
 # "hugin" and "nona_gui" domains
 %find_lang %{name} --all-name
 
@@ -86,6 +92,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS ChangeLog LICENCE_JHEAD LICENCE_VIGRA NEWS README TODO
 %attr(755,root,root) %{_bindir}/autooptimiser
+%attr(755,root,root) %{_bindir}/color_correct_tiff
+%attr(755,root,root) %{_bindir}/fulla
 %attr(755,root,root) %{_bindir}/hugin
 %attr(755,root,root) %{_bindir}/nona
 %attr(755,root,root) %{_bindir}/nona_gui
@@ -95,3 +103,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_desktopdir}/hugin.desktop
 %{_iconsdir}/gnome/*/mimetypes/*.png
 %{_pixmapsdir}/hugin.png
+%{_mandir}/man1/fulla.1*