- release 3 (boost 1.73)

[packages/hugin.git] / hugin.spec

diff --git a/hugin.spec b/hugin.spec
index 8924c27ea2b853c85c8d0b09fa3eac39ffc327b7..1cf6e3ed1549fbdc68fdd5b58af3325f452fdd20 100644 (file)
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,17 +1,14 @@
 Summary:       Toolchain to create panoramic images
 Summary(pl.UTF-8):     Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:          hugin
-Version:       2018.0.0
-Release:       1
+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: 91cb2c31409c9ef02fc86e17ec2fa068
-Patch0:                %{name}-pl.po-update.patch
-Patch1:                %{name}-cppflags.patch
-Patch2:                no-sysctl.patch
-Patch3:                python-install.patch
-Patch4:                exiv2-0.27.patch
+# Source0-md5: 3409c3a84e1881145b5b556df63de73c
+Patch0:                %{name}-cppflags.patch
+Patch1:                python-install.patch
 URL:           http://hugin.sourceforge.net/
 BuildRequires: OpenEXR-devel
 BuildRequires: OpenGL-glut-devel
@@ -32,7 +29,7 @@ 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
@@ -66,18 +63,17 @@ i ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
 
 %prep
 %setup -q
-#%patch0 -p1
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -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
@@ -86,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
@@ -102,6 +99,8 @@ rm -rf $RPM_BUILD_ROOT
 # cmake is so great there is no way to pass proper path
 %{__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}
@@ -130,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -150,13 +150,12 @@ rm -rf $RPM_BUILD_ROOT
 %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/libicpfindlib.so.*.*
 %attr(755,root,root) %{_libdir}/hugin/liblocalfeatures.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
@@ -166,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*