Upstream release.

No longer uses lensfun, replaced by sqlite database.
No longer uses gnu make for batch processing.
Bundled libraries now all gone (vigra and zthread).
New tools: hugin_executor, verdandi, hugin_lensdb.
This commit is contained in:
Bruno Postle 2015-08-19 15:31:53 +01:00
parent 4aec5d67bf
commit 417d259da8
2 changed files with 17 additions and 25 deletions

View File

@ -1,8 +1,8 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Summary: A panoramic photo stitcher and more
Name: hugin
Version: 2014.0.0
Release: 10%{?dist}
Version: 2015.0.0
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
@ -14,16 +14,9 @@ Requires: %{name}-base = %{version}-%{release}
BuildRequires: libpano13-devel >= 2.9.19 zlib-devel libtiff-devel libjpeg-devel
BuildRequires: libpng-devel gettext-devel wxGTK-devel >= 2.7.0 boost-devel freeglut-devel
BuildRequires: cmake desktop-file-utils OpenEXR-devel exiv2-devel glew-devel
BuildRequires: python-devel swig flann-devel lensfun-devel perl-Image-ExifTool >= 9.09
BuildRequires: mesa-libGLU-devel libXmu-devel
%if 0%{?fedora} >= 19
BuildRequires: perl-podlators
%endif
# Fix FTBFS against latest lensfun-0.3 release
# https://bugzilla.redhat.com/show_bug.cgi?id=1168239
Patch1: hugin-2013.0.0-lensfun_0.3.patch
Patch2: hugin-2013.0.0-boost-phoenix3.patch
BuildRequires: python-devel swig flann-devel perl-Image-ExifTool >= 9.09
BuildRequires: mesa-libGLU-devel libXmu-devel sqlite-devel vigra-devel >= 1.9.0
BuildRequires: perl-podlators fftw-devel
%description
hugin can be used to stitch multiple images together. The resulting image can
@ -34,9 +27,7 @@ to create high quality images
%package base
Summary: Command-line tools and libraries required by hugin
Group: Applications/Multimedia
Requires: make enblend >= 3.2 perl-Image-ExifTool >= 9.09
Provides: bundled(vigra) = 1.5.0
Provides: bundled(zthread) = 2.3.1
Requires: enblend >= 3.2 perl-Image-ExifTool >= 9.09
%description base
Command-line tools used to generate panoramic images, install this package
@ -46,9 +37,6 @@ without a GUI environment.
%prep
%setup -q
%patch1 -p1 -b .lensfun_0.3
%patch2 -p1 -b .boost-phoenix3
%build
%cmake . -DBUILD_HSI=1
make VERBOSE=1 %{?_smp_mflags}
@ -110,6 +98,7 @@ fi
%{_bindir}/hugin_stitch_project
%{_bindir}/icpfind
%{_bindir}/calibrate_lens_gui
%{_bindir}/hugin_executor
%{_libdir}/%{name}/libhuginbasewx.so*
%{_libdir}/%{name}/libicpfindlib.so*
%{_datadir}/%{name}/xrc
@ -134,8 +123,9 @@ fi
%{_mandir}/man1/hugin.*
%{_mandir}/man1/hugin_stitch_project.*
%{_mandir}/man1/icpfind.*
%{_mandir}/man1/hugin_executor.*
%doc AUTHORS COPYING README README_JP TODO LICENCE_VIGRA src/celeste/LICENCE_LIBSVM doc/nona.txt doc/fulla.html src/hugin1/hugin/xrc/data/help_en_EN/LICENCE.manual
%doc AUTHORS COPYING README README_JP TODO src/celeste/LICENCE_LIBSVM doc/nona.txt doc/fulla.html src/hugin1/hugin/xrc/data/help_en_EN/LICENCE.manual
%files base
%defattr(-, root, root,-)
@ -145,7 +135,6 @@ fi
%{_bindir}/fulla
%{_bindir}/hugin_hdrmerge
%{_bindir}/nona
%{_bindir}/pto2mk
%{_bindir}/tca_correct
%{_bindir}/vig_optimize
%{_bindir}/cpclean
@ -163,19 +152,18 @@ fi
%{_bindir}/pto_mask
%{_bindir}/pto_move
%{_bindir}/pto_template
%{_bindir}/verdandi
%{_bindir}/hugin_lensdb
%{_libdir}/%{name}/libhuginbase.so*
%{_libdir}/%{name}/libhuginvigraimpex.so*
%{_libdir}/%{name}/libceleste.so*
%{_libdir}/%{name}/liblocalfeatures.so*
%{_libdir}/%{name}/libmakefilelib.so*
%{_libdir}/%{name}/libhuginlines.so*
%{_libdir}/%{name}/libhugin_python_interface.so*
%{python_sitearch}/_hsi.so
%{python_sitearch}/hsi.py*
%{python_sitearch}/hpi.py*
%{_datadir}/%{name}/Makefile.*.mk
%{_datadir}/%{name}/data/celeste.model
%{_datadir}/%{name}/data/hugin_exiftool_copy.arg
%{_mandir}/man1/align_image_stack.*
@ -185,7 +173,6 @@ fi
%{_mandir}/man1/fulla.*
%{_mandir}/man1/hugin_hdrmerge.*
%{_mandir}/man1/nona.*
%{_mandir}/man1/pto2mk.*
%{_mandir}/man1/tca_correct.*
%{_mandir}/man1/vig_optimize.*
%{_mandir}/man1/deghosting_mask.*
@ -202,8 +189,13 @@ fi
%{_mandir}/man1/pto_mask.*
%{_mandir}/man1/pto_move.*
%{_mandir}/man1/pto_template.*
%{_mandir}/man1/verdandi.*
%{_mandir}/man1/hugin_lensdb.*
%changelog
* Wed Aug 19 2015 Bruno Postle <bruno@postle.net> - 2015.0.0-1
- upstream release
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2014.0.0-10
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159

View File

@ -1 +1 @@
711784c27bdb743ddc45dc2c448ac87c hugin-2014.0.0.tar.bz2
fda7d06f296d3d8ded5b03b0062642cd hugin-2015.0.0.tar.bz2