+#
+# Conditional build:
+%bcond_with pano13 # use libpano13 instead of libpano12
+#
+%define _beta beta4
Summary: Toolchain to create panoramic images
-Summary(pl): Zestaw narzêdzi do tworzenia panoramicznych zdjêæ
+Summary(pl.UTF-8): Zestaw narzędzi do tworzenia panoramicznych zdjęć
Name: hugin
-Version: 0.5
-Release: 2
+Version: 0.7
+Release: 0.%{_beta}.2.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}_%{_beta}.tar.bz2
+# Source0-md5: 28b69d85ae06a22fe9514f7f77e6dddb
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-bind-devel >= 1.31
+BuildRequires: boost-graph-devel >= 1.31
+BuildRequires: boost-ref-devel >= 1.31
+BuildRequires: boost-test-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: gtk+2-devel >= 1:2.0.3
BuildRequires: libjpeg-devel
-BuildRequires: libpano12-devel
+%{!?with_pano13:BuildRequires: libpano12-devel >= 2.8.1}
+%{?with_pano13:BuildRequires: libpano13-devel}
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: wxGTK2-unicode-devel >= 2.6.0
+BuildRequires: zip
BuildRequires: zlib-devel
+%{!?with_pano13:BuildConflicts: libpano13-devel}
+%{!?with_pano13:Requires: libpano12 >= 2.8.1}
+%{?with_pano13:Requires: libpano13}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
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.
+%description -l pl.UTF-8
+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æ.
+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
+%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},' 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}
%{__autoheader}
%{__automake}
%configure \
- --with-wx-config=wx-gtk2-ansi-config
+ --with-wx-config=wx-gtk2-unicode-config
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
-
-mv $RPM_BUILD_ROOT%{_datadir}/locale/{ca_ES,ca}
+ DESTDIR=$RPM_BUILD_ROOT \
+ gnomemimeicondir=%{_iconsdir}/hicolor/48x48/mimetypes
# "hugin" and "nona_gui" domains
%find_lang %{name} --all-name
%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
%{_datadir}/%{name}
%{_datadir}/mime/packages/hugin.xml
%{_desktopdir}/hugin.desktop
-%{_iconsdir}/gnome/*/mimetypes/*.png
+%{_iconsdir}/hicolor/*/mimetypes/*.png
%{_pixmapsdir}/hugin.png
+%{_mandir}/man1/fulla.1*