X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=hugin.spec;h=618c5a4e9afe726539edc2595564de9a45c0f544;hb=HEAD;hp=de6400d648b0b42ed6f5d987d00a4ba60ef16a0f;hpb=f4c176a365f5aea8688cda0722706f8fccf2f8ec;p=packages%2Fhugin.git

diff --git a/hugin.spec b/hugin.spec
index de6400d..04d8c74 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,26 +1,30 @@
 Summary:	Toolchain to create panoramic images
 Summary(pl.UTF-8):	Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:		hugin
-Version:	2019.2.0
-Release:	7
+Version:	2022.0.0
+Release:	2
 License:	GPL v2+
 Group:		X11/Applications/Graphics
-Source0:	http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
-# Source0-md5:	3409c3a84e1881145b5b556df63de73c
+Source0:	https://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
+# Source0-md5:	76bbd3d0debc8c8483192d832b9377fd
 Patch0:		%{name}-cppflags.patch
 Patch1:		python-install.patch
-URL:		http://hugin.sourceforge.net/
+Patch2:		%{name}-exiv2.patch
+URL:		https://hugin.sourceforge.io/
 BuildRequires:	OpenEXR-devel
 BuildRequires:	OpenGL-glut-devel
 BuildRequires:	ZThread-devel
-BuildRequires:	boost-devel >= 1.41.0
-BuildRequires:	cmake >= 2.8
+BuildRequires:	boost-devel >= 1.47.0
+BuildRequires:	cmake >= 3.8
 BuildRequires:	exiv2-devel
-BuildRequires:	flann-devel
+BuildRequires:	fftw3-devel >= 3
+BuildRequires:	flann-devel >= 1.9.2-4
 BuildRequires:	gettext-tools
 BuildRequires:	glew-devel
-BuildRequires:	gtk+2-devel >= 1:2.0.3
+BuildRequires:	gtk+3-devel
+BuildRequires:	lcms2-devel >= 2
 BuildRequires:	lensfun-devel
+BuildRequires:	libgomp-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpano13-devel >= 2.9.19
 BuildRequires:	libpng-devel
@@ -29,18 +33,20 @@ BuildRequires:	libtiff-devel
 BuildRequires:	perl-Image-ExifTool
 BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
-BuildRequires:	python3-devel
+BuildRequires:	python3-devel >= 1:3.0
 BuildRequires:	rpmbuild(macros) >= 1.605
 BuildRequires:	sed >= 4.0
+BuildRequires:	sqlite3-devel >= 3
 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:	vigra-devel >= 1.11.1-14
+BuildRequires:	wxGTK3-unicode-devel >= 2.8.10
+BuildRequires:	wxGTK3-unicode-gl-devel >= 2.8.10
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	zlib-devel
 Requires:	libpano13 >= 2.9.19
-Requires:	wxGTK2-unicode >= 2.8.10
-Requires:	wxGTK2-unicode-gl >= 2.8.10
+Requires:	wxGTK3-unicode >= 2.8.10
+Requires:	wxGTK3-unicode-gl >= 2.8.10
 Suggests:	enblend-enfuse >= 3.1
 # exiftool program
 Suggests:	perl-Image-ExifTool
@@ -58,22 +64,26 @@ 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 -p0
+%patch0 -p1
 %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} -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
+%{__mv} src/translations/{cs_CZ,cs}.po
+
+%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
+	src/hugin_script_interface/hpi.py \
+	src/hugin_script_interface/plugins/top_five.py \
+	src/hugin_script_interface/plugins/woa.py \
+	src/hugin_script_interface/plugins-dev/dual_use.py \
+	src/hugin_script_interface/plugins-dev/plugin_skeleton.py
 
 %build
 install -d build
@@ -85,7 +95,7 @@ cd build
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
-	-DwxWidgets_CONFIG_EXECUTABLE=%{_bindir}/wx-gtk2-unicode-config
+	-DwxWidgets_CONFIG_EXECUTABLE=%{_bindir}/wx-gtk3-unicode-config
 
 %{__make}
 
@@ -95,15 +105,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
 	DESTDIR=$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*
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{ca_ES,ca}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{ca_ES@valencia,ca@valencia}
 
-%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}
 
@@ -155,10 +161,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{py3_sitedir}/_hsi.so
 %{py3_sitedir}/hpi.py*
 %{py3_sitedir}/hsi.py*
+%{py3_sitedir}/__pycache__/hpi.cpython-*.py[co]
+%{py3_sitedir}/__pycache__/hsi.cpython-*.py[co]
 %{_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
@@ -166,6 +174,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_desktopdir}/calibrate_lens_gui.desktop
 %{_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*
@@ -183,6 +192,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*