boost rebuild

[packages/hugin.git] / hugin.spec

diff --git a/hugin.spec b/hugin.spec
index f31493f4682ca3c23beb847b14e095994090686a..618c5a4e9afe726539edc2595564de9a45c0f544 100644 (file)
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,16 +1,15 @@
 Summary:       Toolchain to create panoramic images
 Summary(pl.UTF-8):     Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:          hugin
-Version:       2016.0.0
-Release:       2
+Version:       2020.0.0
+Release:       3
 License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
-# Source0-md5: 8407dd7275374a492610221e7ae56be9
-Patch0:                %{name}-pl.po-update.patch
-Patch1:                %{name}-cppflags.patch
-Patch4:                no-sysctl.patch
-Patch6:                python-install.patch
+# Source0-md5: 59e152871b74fb071bc086fc23a4774a
+Patch0:                %{name}-cppflags.patch
+Patch1:                python-install.patch
+Patch2:                openexr3.patch
 URL:           http://hugin.sourceforge.net/
 BuildRequires: OpenEXR-devel
 BuildRequires: OpenGL-glut-devel
@@ -31,11 +30,12 @@ BuildRequires:      libtiff-devel
 BuildRequires: perl-Image-ExifTool
 BuildRequires: perl-tools-pod
 BuildRequires: pkgconfig
-BuildRequires: python-devel
-BuildRequires: rpmbuild(macros) >= 1.471
+BuildRequires: python3-devel
+BuildRequires: rpmbuild(macros) >= 1.605
 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
@@ -59,30 +59,34 @@ you'll probably to install enblend-enfuse package too.
 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ć programów enblend i enfuse do wygładzania krawędzi
-i ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
+Hugin może używać programów enblend i enfuse do wygładzania krawędzi i
+ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
 
 %prep
 %setup -q
-#%patch0 -p1
-%patch1 -p0
-%patch4 -p1
-%patch6 -p1
+%patch0 -p0
+%patch1 -p1
+%patch2 -p1
 
-mv -f src/translations/{cs_CZ,cs}.po
+# Old, broken duplicate of the system cmake one
+%{__rm} CMakeModules/FindZLIB.cmake
 
-%{__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
+%{__mv} src/translations/{cs_CZ,cs}.po
+
+%{__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
 cd build
 %cmake .. \
-       -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
@@ -98,11 +102,13 @@ rm -rf $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}/hicolor/gnome/48x48/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/
+%{__rm} -r $RPM_BUILD_ROOT%{_iconsdir}/hicolor/gnome/48x48
 
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ca_ES*
 
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
 
 %find_lang %{name}
 
@@ -127,6 +133,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
@@ -147,25 +154,27 @@ 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*
+%{py3_sitedir}/__pycache__/*
 %{_datadir}/%{name}
-%{_datadir}/appdata/PTBatcherGUI.appdata.xml
-%{_datadir}/appdata/calibrate_lens_gui.appdata.xml
-%{_datadir}/appdata/hugin.appdata.xml
+%{_datadir}/metainfo/PTBatcherGUI.appdata.xml
+%{_datadir}/metainfo/calibrate_lens_gui.appdata.xml
+%{_datadir}/metainfo/hugin.appdata.xml
 %{_datadir}/mime/packages/hugin.xml
 %{_desktopdir}/hugin.desktop
 %{_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/*x*/mimetypes/application-x-ptoptimizer-script.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*
@@ -181,6 +190,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/hugin_executor.1*
 %{_mandir}/man1/hugin_hdrmerge.1*
 %{_mandir}/man1/hugin_lensdb.1*
+%{_mandir}/man1/hugin_stacker.1*
 %{_mandir}/man1/hugin_stitch_project.1*
 %{_mandir}/man1/icpfind.1*
 %{_mandir}/man1/linefind.1*