- added gcc4 patch, fixed ca locale dir, release 2

[packages/hugin.git] / hugin.spec

diff --git a/hugin.spec b/hugin.spec
index ce91353d74b2802eefaf51cba9e67e466db44d4c..9351424a8d6c11fbe607b0ea2945c946c0132de9 100644 (file)
--- a/hugin.spec
+++ b/hugin.spec
@@ -2,16 +2,19 @@ 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}.1
-# SIFT is patented in USA and may require license for commercial use
-License:       GPL, non-commercial SIFT license for some code
+Release:       2
+License:       GPL v2+
 Group:         Applications/Graphics
-Source0:       http://dl.sourceforge.net/hugin/%{name}-%{version}-%{bver}.tar.bz2
-# Source0-md5: b852b334400ba9d4ae91a5a628846491
+Source0:       http://dl.sourceforge.net/hugin/%{name}-%{version}.tar.gz
+# Source0-md5: 18b38f5d6744831567b7fabfedb643fd
 Patch0:                %{name}-pl.po-update.patch
 Patch1:                %{name}-defaults.patch
+Patch2:                %{name}-gcc4.patch
 URL:           http://hugin.sf.net/
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake
+BuildRequires: boost-any-devel
+BuildRequires: boost-ref-devel
 BuildRequires: boost-test-devel
 BuildRequires: gettext-devel
 BuildRequires: gtk+2-devel >= 2.0.3
@@ -20,9 +23,9 @@ BuildRequires:        libpano12-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
-# 2.4.2 would suffice, but passed wx-config is 2.5-specific
-#BuildRequires:        wxGTK2-devel >= 2.4.2
-BuildRequires: wxGTK2-devel >= 2.5.3
+BuildRequires: libtool >= 2:1.5
+BuildRequires: sed >= 4.0
+BuildRequires: wxGTK2-devel >= 2.6.0
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -31,16 +34,36 @@ 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.
+
 %description -l pl
 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
+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
 %patch0 -p1
 %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
 
 %build
+%{__gettextize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        --with-wx-config=wx-gtk2-ansi-config
 %{__make}
@@ -51,6 +74,8 @@ 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
 
@@ -59,12 +84,14 @@ 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}/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}/gnome/*/mimetypes/*.png
+%{_pixmapsdir}/hugin.png