[enblend] upstream release, no longer provides bundled(vigra), new doc sub-package

[bpostle]

commit 48e1c2f03b21637adebd6b14428889d4f704d639
Author: Bruno Postle <bruno at postle.net>
Date:   Sun Jan 20 23:04:45 2013 +0000

    upstream release, no longer provides bundled(vigra), new doc sub-package

 .gitignore   |    1 +
 enblend.spec |   50 +++++++++++++++++++++++++++++---------------------
 sources      |    2 +-
 3 files changed, 31 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d12c98b..fe10fb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 enblend-enfuse-4.0.tar.gz
+/enblend-enfuse-4.1.tar.gz
diff --git a/enblend.spec b/enblend.spec
index 352422e..670592d 100644
--- a/enblend.spec
+++ b/enblend.spec
@@ -1,30 +1,25 @@
 Summary: Image Blending with Multiresolution Splines
 Name: enblend
-Version: 4.0
-Release: 17%{?dist}
+Version: 4.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/enblend/enblend-enfuse-%{version}.tar.gz
-Patch0: enblend-enfuse-4.0-png14.patch
-Patch1: enblend-enfuse-4.0-boost.patch
 URL: http://enblend.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtiff-devel boost-devel lcms-devel plotutils-devel
+BuildRequires: libtiff-devel boost-devel lcms2-devel plotutils-devel
 BuildRequires: freeglut-devel glew-devel libjpeg-devel libpng-devel OpenEXR-devel
-Buildrequires: transfig gnuplot tidy texinfo
-
-%if 0%{?fedora} >= 9
-BuildRequires: libXmu-devel libXi-devel 
-%endif
-%if 0%{?rhl} >= 4
-BuildRequires: xorg-x11-devel
+BuildRequires: transfig gnuplot tidy texinfo
+BuildRequires: libXmu-devel libXi-devel
+BuildRequires: vigra-devel >= 1.9.0
+BuildRequires: help2man ImageMagick texinfo-tex gsl-devel
+%if 0%{?fedora} >= 18 
+BuildRequires: texlive-latex-fonts texlive-thumbpdf
 %endif
 
 Requires(post): info
 Requires(preun): info
 
-Provides: bundled(vigra) = 1.4.0
-
 %description
 Enblend is a tool for compositing images, given a set of images that overlap in
 some irregular way, Enblend overlays them in such a way that the seam between
@@ -33,15 +28,20 @@ multiple images of the same subject into a single image with good exposure and
 good focus.  Enblend and Enfuse do not line up the images for you, use a tool
 like Hugin to do that.
 
+%package doc
+Summary: Usage Documentation for enblend and enfuse
+Group: Documentation
+
+%description doc
+PDF usage documentation for the enblend and enfuse command line tools
+
 %prep
-%setup -q -n enblend-enfuse-4.0-753b534c819d
-sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx
-%patch0 -p0
-%patch1 -p1 -b .boost
+%setup -q -n enblend-enfuse-%{version}
 
 %build
-%configure --disable-static
+%configure --with-boost-filesystem
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+cd doc && make pdf
 
 %install
 rm -rf %{buildroot}
@@ -64,7 +64,7 @@ fi
 %files
 %defattr(-, root, root)
 
-%doc AUTHORS COPYING INSTALL NEWS README VIGRA_LICENSE
+%doc AUTHORS COPYING INSTALL NEWS README
 
 %{_bindir}/enblend
 %{_bindir}/enfuse
@@ -72,8 +72,16 @@ fi
 %{_infodir}/enblend.*
 %{_infodir}/enfuse.*
 
+%files doc
+%defattr(-,root,root,-)
+%doc COPYING doc/enblend.pdf doc/enfuse.pdf
 
 %changelog
+* Sun Jan 20 2013 Bruno Postle <bruno at postle.net> - 4.1-1
+- Upstream release
+- No longer provides bundled(vigra)
+- New enblend-doc sub package containing pdf documentation
+
 * Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 4.0-17
 - rebuild due to "jpeg8-ABI" feature drop
 
@@ -160,7 +168,7 @@ fi
 * Tue Mar 20 2007 Bruno Postle <bruno at postle.net> 3.0-4
   - patch to build without glew library
 
-* Sat Jan 28 2007 Bruno Postle <bruno at postle.net>
+* Sun Jan 28 2007 Bruno Postle <bruno at postle.net>
   - 3.0 release
 
 * Tue Dec 13 2005 Bruno Postle <bruno at postle.net>
diff --git a/sources b/sources
index a07bd93..3d00902 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e7c950061e0085fd75d94576130250f  enblend-enfuse-4.0.tar.gz
+2921b490f7d99e8e771d53eeeea95f6b  enblend-enfuse-4.1.tar.gz