From 3b0308e943eebe7eed266900328368974e446c01 Mon Sep 17 00:00:00 2001
From: Bruno Postle <bruno@postle.net>
Date: Wed, 13 Apr 2016 19:01:18 +0100
Subject: [PATCH] upstream stable release

---
 hugin.spec | 31 +++++++++++++++++++++----------
 sources    |  2 +-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/hugin.spec b/hugin.spec
index c1f31d9..b777a9c 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -1,7 +1,7 @@
 %{!?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: 2015.0.0
+Version: 2016.0.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
@@ -12,11 +12,11 @@ Requires: webclient
 Requires: wxPython
 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: libpng-devel gettext-devel wxGTK-devel >= 2.8.0 boost-devel freeglut-devel
 BuildRequires: cmake desktop-file-utils OpenEXR-devel exiv2-devel glew-devel
 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
+BuildRequires: mesa-libGLU-devel libXmu-devel sqlite-devel vigra-devel >= 1.10.0
+BuildRequires: perl-podlators fftw-devel lcms2-devel
 
 %description
 hugin can be used to stitch multiple images together. The resulting image can
@@ -27,7 +27,7 @@ to create high quality images
 %package base
 Summary: Command-line tools and libraries required by hugin
 Group: Applications/Multimedia
-Requires: enblend >= 3.2 perl-Image-ExifTool >= 9.09
+Requires: enblend perl-Image-ExifTool
 
 %description base
 Command-line tools used to generate panoramic images, install this package
@@ -38,10 +38,14 @@ without a GUI environment.
 %setup -q
 
 %build
-%cmake . -DBUILD_HSI=1
+# hugin now forces build out of tree
+[ ! -d "build" ] && mkdir  build
+cd build
+%cmake .. -DBUILD_HSI=1
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
+cd build
 make install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor="" --delete-original \
@@ -53,6 +57,7 @@ desktop-file-install --vendor="" --delete-original \
 desktop-file-install --vendor="" --delete-original \
   --dir=%{buildroot}/%{_datadir}/applications \
   %{buildroot}/%{_datadir}/applications/pto_gen.desktop
+cd ..
 %find_lang %{name}
 
 # Merge applications into one software center item
@@ -92,7 +97,6 @@ fi
 %postun base -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-, root, root,-)
 %{_bindir}/PTBatcherGUI
 %{_bindir}/hugin
 %{_bindir}/hugin_stitch_project
@@ -102,7 +106,6 @@ fi
 %{_libdir}/%{name}/libhuginbasewx.so*
 %{_libdir}/%{name}/libicpfindlib.so*
 %{_datadir}/%{name}/xrc
-%{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/PTBatcherGUI.desktop
 %{_datadir}/applications/calibrate_lens_gui.desktop
@@ -115,6 +118,12 @@ fi
 %{_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}/appdata/PTBatcherGUI.appdata.xml
 %{_datadir}/appdata/calibrate_lens_gui.appdata.xml
 %{_datadir}/appdata/hugin.appdata.xml
@@ -125,10 +134,9 @@ fi
 %{_mandir}/man1/icpfind.*
 %{_mandir}/man1/hugin_executor.*
 
-%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
+%doc AUTHORS COPYING README TODO src/celeste/LICENCE_LIBSVM doc/nona.txt doc/fulla.html doc/executor_file_format.txt src/hugin1/hugin/xrc/data/help_en_EN/LICENCE.manual
 
 %files base
-%defattr(-, root, root,-)
 %{_bindir}/align_image_stack
 %{_bindir}/autooptimiser
 %{_bindir}/celeste_standalone
@@ -193,6 +201,9 @@ fi
 %{_mandir}/man1/hugin_lensdb.*
 
 %changelog
+* Wed Apr 13 2016 Bruno Postle <bruno@postle.net> - 2016.0.0-1
+- stable release
+
 * Wed Aug 19 2015 Bruno Postle <bruno@postle.net> - 2015.0.0-1
 - upstream release
 
diff --git a/sources b/sources
index 929c9ff..77e0d82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fda7d06f296d3d8ded5b03b0062642cd  hugin-2015.0.0.tar.bz2
+8407dd7275374a492610221e7ae56be9  hugin-2016.0.0.tar.bz2