SPECS: hugin.spec - updated to 0.6 - updated pl.po-update patch, r...

[qboosh]

Author: qboosh                       Date: Sat Aug 19 20:40:55 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.6
- updated pl.po-update patch, removed obsolete gcc4 patch, added asneeded patch

---- Files affected:
SPECS:
   hugin.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/hugin.spec
diff -u SPECS/hugin.spec:1.16 SPECS/hugin.spec:1.17
--- SPECS/hugin.spec:1.16	Wed Jul 26 18:03:33 2006
+++ SPECS/hugin.spec	Sat Aug 19 22:40:50 2006
@@ -2,32 +2,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
@@ -43,7 +46,7 @@
 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ć.
 
@@ -53,13 +56,18 @@
 %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}
@@ -75,8 +83,6 @@
 %{__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
 
@@ -87,6 +93,8 @@
 %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
@@ -96,6 +104,7 @@
 %{_desktopdir}/hugin.desktop
 %{_iconsdir}/gnome/*/mimetypes/*.png
 %{_pixmapsdir}/hugin.png
+%{_mandir}/man1/fulla.1*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -103,6 +112,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/08/19 20:40:50  qboosh
+- updated to 0.6
+- updated pl.po-update patch, removed obsolete gcc4 patch, added asneeded patch
+
 Revision 1.16  2006/07/26 16:03:33  glen
 - unify sourceforge url
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hugin.spec?r1=1.16&r2=1.17&f=u