From 115813d76fc37cce3eaf8fe98ca622471889f37f Mon Sep 17 00:00:00 2001
From: Bruno Postle <bruno@postle.net>
Date: Apr 13 2016 17:23:22 +0000
Subject: upstream stable release


---

diff --git a/.gitignore b/.gitignore
index 2eb7157..992bec1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ enblend-enfuse-4.0.tar.gz
 /enblend-enfuse-doc-4.1.2.tar.gz
 /enblend-enfuse-4.1.3.tar.gz
 /enblend-enfuse-4.1.4.tar.gz
+/enblend-enfuse-4.2.tar.gz
diff --git a/enblend.spec b/enblend.spec
index 0b34ba9..a3fc5ff 100644
--- a/enblend.spec
+++ b/enblend.spec
@@ -1,7 +1,7 @@
 Summary: Image Blending with Multiresolution Splines
 Name: enblend
-Version: 4.1.4
-Release: 6%{?dist}
+Version: 4.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://downloads.sourceforge.net/enblend/enblend-enfuse-%{version}.tar.gz
@@ -11,19 +11,16 @@ BuildRequires: libtiff-devel boost-devel lcms2-devel plotutils-devel
 BuildRequires: freeglut-devel glew-devel libjpeg-devel libpng-devel OpenEXR-devel
 BuildRequires: libXmu-devel libXi-devel
 BuildRequires: vigra-devel >= 1.9.0
-BuildRequires: gsl-devel help2man
-%if 0%{?doc}
-BuildRequires: transfig gnuplot tidy texinfo
-BuildRequires: ImageMagick texinfo-tex
-BuildRequires: texlive-latex-fonts texlive-thumbpdf
-%endif
+BuildRequires: gsl-devel
 
-# pregenerated info/pdf docs
-Source1: enblend-enfuse-doc-4.1.2.tar.gz
-Patch0: enblend-4.1.4-gcc6.patch
-
-Requires(post): info
-Requires(preun): info
+# for the documentation
+BuildRequires: gnuplot graphviz hevea tidy help2man ImageMagick librsvg2-tools texinfo texinfo-tex
+BuildRequires: tex(amsmath.sty) tex(bold-extra.sty) tex(color.sty) tex(enumitem.sty) tex(fixltx2e.sty)
+BuildRequires: tex(footnote.sty) tex(graphicx.sty) tex(hyperref.sty) tex(hyphenat.sty) tex(ifpdf.sty)
+BuildRequires: tex(index.sty) tex(latexsym.sty) tex(listings.sty) tex(microtype.sty) tex(nag.sty)
+BuildRequires: tex(ragged2e.sty) tex(shorttoc.sty) tex(suffix.sty) tex(trivfloat.sty) tex(url.sty) tex(xstring.sty)
+BuildRequires: texlive-floatrow texlive-comment texlive-epstopdf-bin texlive-latex-fonts texlive-thumbpdf texlive-texloganalyser
+BuildRequires: perl-Readonly
 
 %description
 Enblend is a tool for compositing images, given a set of images that overlap in
@@ -36,64 +33,41 @@ like Hugin to do that.
 %package doc
 Summary: Usage Documentation for enblend and enfuse
 Group: Documentation
+License: GFDL
 
 %description doc
 PDF usage documentation for the enblend and enfuse command line tools
 
 %prep
-%setup -q -n enblend-enfuse-%{version} %{!?doc:-a 1}
-%patch0 -p1
+%setup -q -n enblend-enfuse-%{version}
 
 %build
-%configure --with-boost-filesystem
-
-make %{?_smp_mflags}
-
-%if 0%{?doc}
-(cd doc && make pdf )
-%endif
-
+export CPPFLAGS=-I/usr/include/gperftools
+%configure --with-boost-filesystem --with-tcmalloc --enable-opencl --enable-openmp
+make all pdf %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-%if 0%{?doc}
-rm -f %{buildroot}%{_infodir}/dir
-%else
-install -m644 -p -D doc/enblend.info %{buildroot}%{_infodir}/enblend.info
-install -m644 -p -D doc/enfuse.info %{buildroot}%{_infodir}/enfuse.info
-%endif
-
 %clean
 rm -rf %{buildroot}
 
-%post
-/sbin/install-info %{_infodir}/enblend.info %{_infodir}/dir || :
-/sbin/install-info %{_infodir}/enfuse.info %{_infodir}/dir || :
-
-%preun
-if [ $1 = 0 ] ; then
-  /sbin/install-info --delete %{_infodir}/enblend.info %{_infodir}/dir || :
-  /sbin/install-info --delete %{_infodir}/enfuse.info %{_infodir}/dir || :
-fi
-
 %files
-%defattr(-, root, root)
-
 %doc AUTHORS COPYING NEWS README
 
 %{_bindir}/enblend
 %{_bindir}/enfuse
 %{_mandir}/man1/*
-%{_infodir}/enblend.*
-%{_infodir}/enfuse.*
 
 %files doc
-%defattr(-,root,root,-)
 %doc COPYING doc/enblend.pdf doc/enfuse.pdf
+%{_docdir}/enblend-enfuse/examples/enfuse/*
 
 %changelog
+* Wed Apr 13 2016 Bruno Postle <bruno@postle.net> - 4.2-1
+- upstream stable release
+
 * Wed Mar 02 2016 Bruno Postle <bruno@postle.net> - 4.1.4-6
 - rebuilt for new libgsl
 
diff --git a/sources b/sources
index 83fcf06..1041590 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-75616e9e955595c87faf71d5fceb3e24  enblend-enfuse-doc-4.1.2.tar.gz
-51abb1add90786ed64ec261778b31647  enblend-enfuse-4.1.4.tar.gz
+e26751f393862cecfd1a113003787001  enblend-enfuse-4.2.tar.gz