X-Git-Url: http://git.pld-linux.org/?p=packages%2Fhugin.git;a=blobdiff_plain;f=hugin.spec;h=dd6a7f27b99b463eaa57ec43376a427cc8efe777;hp=c1483df0582c12ad401edfb4f3e75aa8e96bc851;hb=3f5c4a76e6449f6391db4f18e690f1ea0889e241;hpb=9d98c2c78f7f615bbc63d5fd3c056586e39a08c4

diff --git a/hugin.spec b/hugin.spec
index c1483df..dd6a7f2 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,68 +1,123 @@
 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
-%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
-Group:		Applications/Graphics
-Source0:	http://dl.sourceforge.net/hugin/%{name}-%{version}-%{bver}.tar.bz2
-# Source0-md5:	b852b334400ba9d4ae91a5a628846491
+Version:	0.7.0
+Release:	5
+License:	GPL v2+
+Group:		X11/Applications/Graphics
+Source0:	http://dl.sourceforge.net/hugin/%{name}-%{version}.tar.gz
+# Source0-md5:	6efbfc72ceba028ca3dff3c23806a7f3
 Patch0:		%{name}-pl.po-update.patch
-URL:		http://hugin.sf.net/
-BuildRequires:	boost-test-devel
+Patch1:		%{name}-asneeded.patch
+Patch2:		%{name}-cppflags.patch
+URL:		http://hugin.sourceforge.net/
+BuildRequires:	OpenEXR-devel
+BuildRequires:	boost-devel >= 1.35.0
+BuildRequires:	cmake >= 2.4
+BuildRequires:	exiv2-devel
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2.0.3
+BuildRequires:	gtk+2-devel >= 1:2.0.3
 BuildRequires:	libjpeg-devel
-BuildRequires:	libpano12-devel
+BuildRequires:	libpano13-devel >= 2.9.12
 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:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.471
+BuildRequires:	sed >= 4.0
+BuildRequires:	wxGTK2-unicode-devel >= 2.6.0
+BuildRequires:	zip
 BuildRequires:	zlib-devel
+Suggests:	autopano-sift-C >= 2.5.0
+Suggests:	enblend-enfuse >= 3.1
+# exiftool program
+Suggests:	perl-Image-ExifTool
 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.
- 
-%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.
+
+Note: Hugin can use autopano-sift-C package to match images and
+enblend package for soft blending, so you'll probably want to install
+them too.
+
+%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-sift-C 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 -p0
+
+mv -f src/translations/{ca_ES,ca}.po
+mv -f src/translations/{cs_CZ,cs}.po
 
 %build
-%configure \
-	--with-wx-config=wx-gtk2-ansi-config
+install -d build
+cd build
+%cmake .. \
+	-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:None} \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DCMAKE_VERBOSE_MAKEFILE=ON \
+%if "%{_lib}" == "lib64"
+	-DLIB_SUFFIX=64 \
+%endif
+	-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-gtk2-unicode-config
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# "hugin" and "nona_gui" domains
-%find_lang %{name} --all-name
+# cmake is so great there is no way to pass proper path
+mv $RPM_BUILD_ROOT%{_iconsdir}/{gnome,hicolor}
+
+# not needed
+rm $RPM_BUILD_ROOT%{_libdir}/libhugin*.so
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog LICENCE_SIFT README TODO
+%doc AUTHORS ChangeLog LICENCE_JHEAD LICENCE_VIGRA README TODO
+%lang(ja) %doc README_JP
+%attr(755,root,root) %{_bindir}/align_image_stack
 %attr(755,root,root) %{_bindir}/autooptimiser
+%attr(755,root,root) %{_bindir}/fulla
 %attr(755,root,root) %{_bindir}/hugin
+%attr(755,root,root) %{_bindir}/hugin_hdrmerge
+%attr(755,root,root) %{_bindir}/hugin_stitch_project
+%attr(755,root,root) %{_bindir}/matchpoint
 %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
+%attr(755,root,root) %{_bindir}/pto2mk
+%attr(755,root,root) %{_bindir}/tca_correct
+%attr(755,root,root) %{_bindir}/vig_optimize
+%attr(755,root,root) %{_libdir}/libhuginANN.so.*.*
+%attr(755,root,root) %{_libdir}/libhuginbase.so.*.*
+%attr(755,root,root) %{_libdir}/libhuginjhead.so.*.*
+%attr(755,root,root) %{_libdir}/libhuginvigraimpex.so.*.*
 %{_datadir}/%{name}
+%{_datadir}/mime/packages/hugin.xml
+%{_desktopdir}/hugin.desktop
+%{_desktopdir}/hugin_stitch_project.desktop
+%{_iconsdir}/hicolor/*/mimetypes/gnome-mime-application-x-ptoptimizer-script.png
+%{_pixmapsdir}/hugin.png
+%{_mandir}/man1/fulla.1*