X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=hugin.spec;h=8527c737df36b4fcf9fa0b347436f64358b7daf4;hb=87e5315f8e7b3300e7aff8f789aa91915f8f9a2f;hp=f2ce8800f89c09e00941f35d53aba5091e57c3bb;hpb=6ecc4767e44005a28a35d20f5d01b617906d56e7;p=packages%2Fhugin.git

diff --git a/hugin.spec b/hugin.spec
index f2ce880..8527c73 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,37 +1,45 @@
+%define		_beta	beta1
 Summary:	Toolchain to create panoramic images
 Summary(pl):	Zestaw narzêdzi do tworzenia panoramicznych zdjêæ
 Name:		hugin
-Version:	0.5
-%define	bver	beta4
-Release:	0.%{bver}.2
-# SIFT is patented in USA and may require license for commercial use
-License:	GPL, non-commercial SIFT license for some code
+Version:	0.7
+Release:	0.%{_beta}.1
+License:	GPL v2+
 Group:		Applications/Graphics
-Source0:	http://dl.sourceforge.net/hugin/%{name}-%{version}-%{bver}.tar.bz2
-# Source0-md5:	b852b334400ba9d4ae91a5a628846491
-Patch0:		%{name}-cvs.patch
-Patch1:		%{name}-pl.po-update.patch
-Patch2:		%{name}-defaults.patch
-URL:		http://hugin.sf.net/
-BuildRequires:	boost-any-devel
-BuildRequires:	boost-test-devel
+Source0:	http://dl.sourceforge.net/hugin/%{name}-%{version}-%{_beta}.tar.bz2
+# Source0-md5:	1db122330b5b42792808f9f4f85933d8
+Patch0:		%{name}-pl.po-update.patch
+Patch1:		%{name}-defaults.patch
+Patch2:		%{name}-asneeded.patch
+URL:		http://hugin.sourceforge.net/
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake
+BuildRequires:	boost-any-devel >= 1.31
+BuildRequires:	boost-ref-devel >= 1.31
+BuildRequires:	boost-test-devel >= 1.31
+BuildRequires:	boost-bind-devel >= 1.31
+BuildRequires:	boost-thread-devel >= 1.31
+BuildRequires:	boost-uBLAS-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
 With hugin you can assemble a mosaic of photographs into a complete
 immensive panorama, stitch any series of overlapping pictures and much
 more.
- 
+
 Note: Hugin can use autopano-sift package to match images and enblend
 package for soft blending, so you'll probably want to install them
 too.
@@ -40,19 +48,33 @@ 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æ.
 
 %prep
-%setup -q -n %{name}-%{version}-%{bver}
+%setup -q -n %{name}-%{version}-%{_beta}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
-sed -i -e 's,ac_boost_libdir=.*/lib.*,ac_boost_libdir=/usr/%{_lib},' configure
+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}
+%{__autoheader}
+%{__automake}
 %configure \
 	--with-wx-config=wx-gtk2-ansi-config
 %{__make}
@@ -61,7 +83,8 @@ sed -i -e 's,ac_boost_libdir=.*/lib.*,ac_boost_libdir=/usr/%{_lib},' configure
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	gnomemimeicondir=%{_iconsdir}/hicolor/48x48/mimetypes
 
 # "hugin" and "nona_gui" domains
 %find_lang %{name} --all-name
@@ -71,12 +94,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog LICENCE_SIFT README TODO
+%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
-%attr(755,root,root) %{_bindir}/panosifter
-%attr(755,root,root) %{_bindir}/sift_keypoints
 %attr(755,root,root) %{_bindir}/zhang_undistort
 %{_datadir}/%{name}
+%{_datadir}/mime/packages/hugin.xml
+%{_desktopdir}/hugin.desktop
+%{_iconsdir}/hicolor/*/mimetypes/*.png
+%{_pixmapsdir}/hugin.png
+%{_mandir}/man1/fulla.1*