From 5ce8721c8e6ba8380b9bcc5392a69141f3678704 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Thu, 26 Mar 2020 00:01:37 +0100
Subject: [PATCH] - up to 2019.2.0 - python support moved to python3

---
 exiv2-0.27.patch | 25 -------------------------
 hugin.spec       | 26 ++++++++++++--------------
 2 files changed, 12 insertions(+), 39 deletions(-)
 delete mode 100644 exiv2-0.27.patch

diff --git a/exiv2-0.27.patch b/exiv2-0.27.patch
deleted file mode 100644
index c3a35fa..0000000
--- a/exiv2-0.27.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- hugin-2018.0.0/src/hugin_base/panodata/Exiv2Helper.h~	2015-05-10 08:52:11.000000000 +0200
-+++ hugin-2018.0.0/src/hugin_base/panodata/Exiv2Helper.h	2019-02-13 00:21:38.240804793 +0100
-@@ -30,7 +30,7 @@
- 
- #include <string>
- #include <vector>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- // these functions are intentionally not exposed to public
- // they are supposed only be used by SrcPanoImage.cpp for internal use
---- hugin-2019.0.0/src/hugin1/hugin/RawImport.cpp~	2019-02-02 11:11:01.000000000 +0100
-+++ hugin-2019.0.0/src/hugin1/hugin/RawImport.cpp	2019-10-12 16:35:33.327500060 +0200
-@@ -35,10 +35,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/easyaccess.hpp>
--#include <exiv2/xmpsidecar.hpp>
-+#include <exiv2/exiv2.hpp>
- #ifdef __WXMSW__
- #include <wx/msw/registry.h>
- #endif
diff --git a/hugin.spec b/hugin.spec
index dc4cf9d..882bddd 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,15 +1,14 @@
 Summary:	Toolchain to create panoramic images
 Summary(pl.UTF-8):	Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:		hugin
-Version:	2019.0.0
-Release:	6
+Version:	2019.2.0
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Graphics
 Source0:	http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
-# Source0-md5:	4ca039f96bfc592c4adcebe27b98fee3
-Patch1:		%{name}-cppflags.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
@@ -30,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
@@ -64,13 +63,12 @@ i ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
 
 %prep
 %setup -q
-%patch1 -p0
-%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,' \
+%{__sed} -i -e '1s,#! \?/usr/bin/env python,#!/usr/bin/python3,' \
 	src/hugin_script_interface/hpi.py \
 	src/hugin_script_interface/plugins/*.py \
 	src/hugin_script_interface/plugins-dev/*.py
@@ -153,9 +151,9 @@ rm -rf $RPM_BUILD_ROOT
 %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
-- 
2.43.0