X-Git-Url: http://git.pld-linux.org/?p=packages%2Fhugin.git;a=blobdiff_plain;f=hugin.spec;h=8924c27ea2b853c85c8d0b09fa3eac39ffc327b7;hp=4c7c59f6e201906aa35298b2d60d475a9866d45d;hb=da665841e891e19a4f81e55c8acde2061ea48c8e;hpb=acd0ae4df73182adcbfd699fdddf6c3be577c147

diff --git a/hugin.spec b/hugin.spec
index 4c7c59f..8924c27 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,15 +1,17 @@
 Summary:	Toolchain to create panoramic images
 Summary(pl.UTF-8):	Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:		hugin
-Version:	2014.0.0
+Version:	2018.0.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Graphics
 Source0:	http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
-# Source0-md5:	711784c27bdb743ddc45dc2c448ac87c
+# Source0-md5:	91cb2c31409c9ef02fc86e17ec2fa068
 Patch0:		%{name}-pl.po-update.patch
 Patch1:		%{name}-cppflags.patch
-Patch2:		%{name}-boost.patch
+Patch2:		no-sysctl.patch
+Patch3:		python-install.patch
+Patch4:		exiv2-0.27.patch
 URL:		http://hugin.sourceforge.net/
 BuildRequires:	OpenEXR-devel
 BuildRequires:	OpenGL-glut-devel
@@ -18,7 +20,7 @@ BuildRequires:	boost-devel >= 1.41.0
 BuildRequires:	cmake >= 2.8
 BuildRequires:	exiv2-devel
 BuildRequires:	flann-devel
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
 BuildRequires:	glew-devel
 BuildRequires:	gtk+2-devel >= 1:2.0.3
 BuildRequires:	lensfun-devel
@@ -35,6 +37,7 @@ BuildRequires:	rpmbuild(macros) >= 1.471
 BuildRequires:	sed >= 4.0
 BuildRequires:	swig-python >= 2.0.4
 BuildRequires:	tclap
+BuildRequires:	vigra-devel
 BuildRequires:	wxGTK2-unicode-devel >= 2.8.10
 BuildRequires:	wxGTK2-unicode-gl-devel >= 2.8.10
 BuildRequires:	zlib-devel
@@ -66,6 +69,8 @@ i ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
 #%patch0 -p1
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 mv -f src/translations/{cs_CZ,cs}.po
 
@@ -95,7 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 # cmake is so great there is no way to pass proper path
-mv $RPM_BUILD_ROOT%{_iconsdir}/{gnome,hicolor}
+%{__mv} $RPM_BUILD_ROOT%{_iconsdir}/{gnome,hicolor}
+
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ca_ES*
 
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
@@ -107,8 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog LICENCE_VIGRA README TODO src/celeste/LICENCE_{GABOR,LIBSVM}
-%lang(ja) %doc README_JP
+%doc AUTHORS Changes.txt README TODO src/celeste/LICENCE_{GABOR,LIBSVM}
 %attr(755,root,root) %{_bindir}/PTBatcherGUI
 %attr(755,root,root) %{_bindir}/align_image_stack
 %attr(755,root,root) %{_bindir}/autooptimiser
@@ -121,7 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/fulla
 %attr(755,root,root) %{_bindir}/geocpset
 %attr(755,root,root) %{_bindir}/hugin
+%attr(755,root,root) %{_bindir}/hugin_executor
 %attr(755,root,root) %{_bindir}/hugin_hdrmerge
+%attr(755,root,root) %{_bindir}/hugin_lensdb
 %attr(755,root,root) %{_bindir}/hugin_stitch_project
 %attr(755,root,root) %{_bindir}/icpfind
 %attr(755,root,root) %{_bindir}/linefind
@@ -135,23 +143,24 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/pto_move
 %attr(755,root,root) %{_bindir}/pto_template
 %attr(755,root,root) %{_bindir}/pto_var
-%attr(755,root,root) %{_bindir}/pto2mk
 %attr(755,root,root) %{_bindir}/tca_correct
+%attr(755,root,root) %{_bindir}/verdandi
 %attr(755,root,root) %{_bindir}/vig_optimize
 %dir %{_libdir}/hugin
 %attr(755,root,root) %{_libdir}/hugin/libceleste.so.*.*
 %attr(755,root,root) %{_libdir}/hugin/libhuginbase.so.*.*
 %attr(755,root,root) %{_libdir}/hugin/libhuginbasewx.so.*.*
 %attr(755,root,root) %{_libdir}/hugin/libhuginlines.so.*.*
-%attr(755,root,root) %{_libdir}/hugin/libhuginvigraimpex.so.*.*
 %attr(755,root,root) %{_libdir}/hugin/libicpfindlib.so.*.*
 %attr(755,root,root) %{_libdir}/hugin/liblocalfeatures.so.*.*
-%attr(755,root,root) %{_libdir}/hugin/libmakefilelib.so.*.*
 %attr(755,root,root) %{_libdir}/hugin/libhugin_python_interface.so.*.*
 %attr(755,root,root) %{py_sitedir}/_hsi.so
 %{py_sitedir}/hpi.py*
 %{py_sitedir}/hsi.py*
 %{_datadir}/%{name}
+%{_datadir}/appdata/PTBatcherGUI.appdata.xml
+%{_datadir}/appdata/calibrate_lens_gui.appdata.xml
+%{_datadir}/appdata/hugin.appdata.xml
 %{_datadir}/mime/packages/hugin.xml
 %{_desktopdir}/hugin.desktop
 %{_desktopdir}/pto_gen.desktop
@@ -172,14 +181,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/fulla.1*
 %{_mandir}/man1/geocpset.1*
 %{_mandir}/man1/hugin.1*
+%{_mandir}/man1/hugin_executor.1*
 %{_mandir}/man1/hugin_hdrmerge.1*
+%{_mandir}/man1/hugin_lensdb.1*
 %{_mandir}/man1/hugin_stitch_project.1*
 %{_mandir}/man1/icpfind.1*
 %{_mandir}/man1/linefind.1*
 %{_mandir}/man1/nona.1*
 %{_mandir}/man1/pano_modify.1*
 %{_mandir}/man1/pano_trafo.1*
-%{_mandir}/man1/pto2mk.1*
 %{_mandir}/man1/pto_gen.1*
 %{_mandir}/man1/pto_lensstack.1*
 %{_mandir}/man1/pto_merge.1*
@@ -189,3 +199,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pto_var.1*
 %{_mandir}/man1/tca_correct.1*
 %{_mandir}/man1/vig_optimize.1*
+%{_mandir}/man1/verdandi.1*