X-Git-Url: http://git.pld-linux.org/?p=packages%2Fhugin.git;a=blobdiff_plain;f=hugin.spec;h=1cf6e3ed1549fbdc68fdd5b58af3325f452fdd20;hp=e638bcd5c0def6e23e0c2ce71a506cf2cc1e0422;hb=57c3e13;hpb=4893e13b1f317d3d58b2873c0dbf0578c54ec59d

diff --git a/hugin.spec b/hugin.spec
index e638bcd..1cf6e3e 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,19 +1,14 @@
 Summary:	Toolchain to create panoramic images
 Summary(pl.UTF-8):	Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:		hugin
-Version:	2014.0.0
-Release:	8
+Version:	2019.2.0
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications/Graphics
 Source0:	http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
-# Source0-md5:	711784c27bdb743ddc45dc2c448ac87c
-Patch0:		%{name}-pl.po-update.patch
-Patch1:		%{name}-cppflags.patch
-Patch2:		%{name}-boost.patch
-Patch3:		boost-1.57.0.patch
-Patch4:		no-sysctl.patch
-Patch5:		lensfun-0.3.patch
-Patch6:		python-install.patch
+# Source0-md5:	3409c3a84e1881145b5b556df63de73c
+Patch0:		%{name}-cppflags.patch
+Patch1:		python-install.patch
 URL:		http://hugin.sourceforge.net/
 BuildRequires:	OpenEXR-devel
 BuildRequires:	OpenGL-glut-devel
@@ -34,11 +29,12 @@ BuildRequires:	libtiff-devel
 BuildRequires:	perl-Image-ExifTool
 BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
-BuildRequires:	python-devel
+BuildRequires:	python3-devel
 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
@@ -67,20 +63,17 @@ i ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
 
 %prep
 %setup -q
-#%patch0 -p1
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch0 -p0
+%patch1 -p1
 
 mv -f src/translations/{cs_CZ,cs}.po
 
-%{__sed} -i -e '1s,#! \?/usr/bin/env python,#!/usr/bin/python,' \
-	src/hugin_script_interface/hpi.py \
-	src/hugin_script_interface/plugins/*.py \
-	src/hugin_script_interface/plugins-dev/*.py
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
+      src/hugin_script_interface/hpi.py \
+      src/hugin_script_interface/plugins-dev/dual_use.py \
+      src/hugin_script_interface/plugins-dev/plugin_skeleton.py \
+      src/hugin_script_interface/plugins/top_five.py \
+      src/hugin_script_interface/plugins/woa.py
 
 %build
 install -d build
@@ -89,6 +82,7 @@ cd build
 	-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:None} \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	-DBUILD_HSI:BOOL=ON \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
@@ -103,7 +97,11 @@ 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} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/gnome/*x*/mimetypes/gnome-mime-application-x-ptoptimizer-script.png
+
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ca_ES*
 
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
@@ -115,8 +113,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
@@ -129,7 +126,10 @@ 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_stacker
 %attr(755,root,root) %{_bindir}/hugin_stitch_project
 %attr(755,root,root) %{_bindir}/icpfind
 %attr(755,root,root) %{_bindir}/linefind
@@ -143,22 +143,19 @@ 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*
+%attr(755,root,root) %{py3_sitedir}/_hsi.so
+%{py3_sitedir}/hpi.py*
+%{py3_sitedir}/hsi.py*
 %{_datadir}/%{name}
 %{_datadir}/appdata/PTBatcherGUI.appdata.xml
 %{_datadir}/appdata/calibrate_lens_gui.appdata.xml
@@ -168,9 +165,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_desktopdir}/pto_gen.desktop
 %{_desktopdir}/PTBatcherGUI.desktop
 %{_desktopdir}/calibrate_lens_gui.desktop
-%{_iconsdir}/hicolor/*/mimetypes/gnome-mime-application-x-ptoptimizer-script.png
-%{_pixmapsdir}/hugin.png
-%{_pixmapsdir}/ptbatcher.png
+%{_iconsdir}/hicolor/*x*/apps/hugin.png
+%{_iconsdir}/hicolor/*x*/apps/ptbatcher.png
+%{_iconsdir}/hicolor/scalable/apps/hugin.svg
+%{_iconsdir}/hicolor/scalable/apps/ptbatcher.svg
 %{_mandir}/man1/PTBatcherGUI.1*
 %{_mandir}/man1/align_image_stack.1*
 %{_mandir}/man1/autooptimiser.1*
@@ -183,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*
@@ -200,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*