From 58411d418a46c761bed2f23678d93fb707d4bc37 Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Thu, 30 Dec 2021 10:24:22 +0000 Subject: [PATCH] Upstream stable release --- hugin.spec | 65 +++++++++++------------------------------------------- sources | 2 +- 2 files changed, 14 insertions(+), 53 deletions(-) diff --git a/hugin.spec b/hugin.spec index adc2ce2..3ec13ed 100644 --- a/hugin.spec +++ b/hugin.spec @@ -1,16 +1,9 @@ Summary: A panoramic photo stitcher and more Name: hugin -Version: 2020.0.0 -Release: 12%{?dist} +Version: 2021.0.0 +Release: 1%{?dist} License: GPLv2+ -Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2 -# As of OpenEXR 3 upstream has significantly reorganized the libraries -# including splitting out imath as a standalone library (which this project may -# or may not need). Please see -# https://github.com/AcademySoftwareFoundation/Imath/blob/master/docs/PortingGuide2-3.md -# for porting details and encourage upstream to support it. For now a minimal -# pactch is provided. -Patch0: hugin-openexr3.patch +Source: https://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2 URL: http://hugin.sourceforge.net/ Requires: shared-mime-info Requires: webclient @@ -18,16 +11,10 @@ Requires: %{name}-base = %{version}-%{release} BuildRequires: gcc-c++ BuildRequires: libpano13-devel zlib-devel libtiff-devel libjpeg-devel BuildRequires: libpng-devel gettext-devel wxGTK3-devel boost-devel freeglut-devel -BuildRequires: cmake desktop-file-utils exiv2-devel glew-devel +BuildRequires: cmake desktop-file-utils OpenEXR-devel exiv2-devel glew-devel BuildRequires: python3-devel swig flann-devel perl-Image-ExifTool BuildRequires: mesa-libGLU-devel libXmu-devel sqlite-devel vigra-devel BuildRequires: perl-podlators fftw-devel lcms2-devel -%if 0%{?fedora} > 34 -BuildRequires: cmake(OpenEXR) -BuildRequires: cmake(Imath) -%else -BuildRequires: OpenEXR-devel -%endif %description hugin can be used to stitch multiple images together. The resulting image can @@ -51,11 +38,6 @@ src/hugin_script_interface/plugins-dev/*.py \ src/hugin_script_interface/*.py \ src/hugin_script_interface/plugins/*.py -# Bundled version does not define ZLIB::ZLIB -%if 0%{?fedora} > 33 -rm CMakeModules/FindZLIB.cmake -%endif - %build %cmake -DBUILD_HSI=1 %cmake_build @@ -100,25 +82,13 @@ EOF %{_libdir}/%{name}/libhuginbasewx.so* %{_libdir}/%{name}/libicpfindlib.so* %{_datadir}/%{name}/xrc -%{_datadir}/%{name}/data %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/PTBatcherGUI.desktop %{_datadir}/applications/calibrate_lens_gui.desktop %{_datadir}/applications/pto_gen.desktop -%{_datadir}/icons/gnome/*/mimetypes/* %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/icons/hicolor/*/mimetypes/* %{_datadir}/mime/packages/%{name}.xml -%{_datadir}/%{name}/data/default.setting -%{_datadir}/%{name}/data/plugins/README_*.txt -%{_datadir}/%{name}/data/plugins/*.py* -%{_datadir}/%{name}/data/plugins-templates/*.py* -%{_datadir}/%{name}/data/hugin_exiftool_copy.arg -%{_datadir}/%{name}/data/blended_stacks.executor -%{_datadir}/%{name}/data/fused_layers.executor -%{_datadir}/%{name}/data/hdr_pano.executor -%{_datadir}/%{name}/data/normal_enblend.executor -%{_datadir}/%{name}/data/normal_smartblend.executor -%{_datadir}/%{name}/data/zeronoise.executor %{_datadir}/metainfo/PTBatcherGUI.appdata.xml %{_datadir}/metainfo/calibrate_lens_gui.appdata.xml %{_datadir}/metainfo/hugin.appdata.xml @@ -170,19 +140,7 @@ EOF %{python3_sitearch}/hpi.py* %{python3_sitearch}/__pycache__/* -%{_datadir}/%{name}/data/celeste.model -%{_datadir}/%{name}/data/hugin_exiftool_copy.arg -%{_datadir}/%{name}/data/hugin_exiftool_final_example.arg -%{_datadir}/%{name}/data/normal_enblend_cubic.executor -%{_datadir}/%{name}/data/normal_layered_tiff.executor -%{_datadir}/%{name}/data/median_stack.executor -%{_datadir}/%{name}/data/expressions.ini -%{_datadir}/%{name}/data/multirow.assistant -%{_datadir}/%{name}/data/normal.assistant -%{_datadir}/%{name}/data/scanned.assistant -%{_datadir}/%{name}/data/scanned2.assistant -%{_datadir}/%{name}/data/duallens.assistant -%{_datadir}/%{name}/data/stacked.assistant +%{_datadir}/%{name}/data %{_mandir}/man1/align_image_stack.* %{_mandir}/man1/autooptimiser.* @@ -211,6 +169,9 @@ EOF %{_mandir}/man1/hugin_lensdb.* %changelog +* Thu Dec 30 2021 Bruno Postle - 2021.0.0-1 +- upstream stable release + * Sat Aug 21 2021 Richard Shaw - 2020.0.0-12 - Rebuild for OpenEXR/Imath 3.1. @@ -246,6 +207,7 @@ EOF * Sat Dec 12 2020 Bruno Postle - 2020.0.0-1 - stable release +- remove -DUSE_GDKBACKEND_X11=1 wayland workaround as WX now carries a patch for this directly * Sat Aug 08 2020 Rich Mattes - 2019.2.0-7 - Rebuild for flann-1.9.1 @@ -265,7 +227,6 @@ EOF * Wed Jan 29 2020 Fedora Release Engineering - 2019.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Sun Jan 05 2020 Bruno Postle - 2019.2.0-1 - stable release @@ -543,7 +504,7 @@ EOF * Wed Jul 14 2010 Dan Horák - 2010.0.0-3 - rebuilt against wxGTK-2.8.11-2 -* Mon May 31 2010 Rex Dieter - 2010.0.0-2 +* Mon May 31 2010 Rex Dieter - 2010.0.0-2 - rebuild (exiv2) * Tue Mar 23 2010 Bruno Postle 2010.0.0-1 @@ -552,7 +513,7 @@ EOF * Fri Feb 05 2010 Bruno Postle 2009.4.0-1 - Fixes for push to fedora - + * Fri Jan 22 2010 Rahul Sundaram - 2009.2.0-2 - Rebuild for Boost soname bump @@ -578,7 +539,7 @@ EOF * Tue Feb 24 2009 Fedora Release Engineering - 0.7.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Thu Dec 18 2008 Rex Dieter - 0.7.0-3 +* Thu Dec 18 2008 Rex Dieter - 0.7.0-3 - respin (eviv2) * Thu Dec 18 2008 Petr Machata - 0.7.0-2 diff --git a/sources b/sources index f33a39a..5336c64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hugin-2020.0.0.tar.bz2) = 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e +SHA512 (hugin-2021.0.0.tar.bz2) = fb491af2543dda8c6d3c9d125936a32a04109eec39e3091347ef2856073d4e1f04017686acb8000e50e29a0ac8dcfe463b63613b277f8fb4aec0537f58a6c853