[enblend] avoid/fix pitfalls associated with texinfo-5.1 (#919935)

[Rex Dieter]

commit 1cb4748809b1aaef6821d4d6186a56152e2a8b41
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 14 12:26:24 2013 -0500

    avoid/fix pitfalls associated with texinfo-5.1 (#919935)

 enblend-enfuse-4.1.1-TEXINPUTS.patch |   37 ++++++++++++++++++++++++++++++++++
 enblend.spec                         |   18 ++++++++++++---
 2 files changed, 51 insertions(+), 4 deletions(-)
---
diff --git a/enblend-enfuse-4.1.1-TEXINPUTS.patch b/enblend-enfuse-4.1.1-TEXINPUTS.patch
new file mode 100644
index 0000000..1ea173e
--- /dev/null
+++ b/enblend-enfuse-4.1.1-TEXINPUTS.patch
@@ -0,0 +1,37 @@
+diff -up enblend-enfuse-4.1.1/doc/Makefile.am.doc enblend-enfuse-4.1.1/doc/Makefile.am
+diff -up enblend-enfuse-4.1.1/doc/Makefile.in.doc enblend-enfuse-4.1.1/doc/Makefile.in
+--- enblend-enfuse-4.1.1/doc/Makefile.in.doc	2013-02-15 08:14:30.000000000 -0600
++++ enblend-enfuse-4.1.1/doc/Makefile.in	2013-03-14 12:18:42.002825015 -0500
+@@ -387,12 +387,12 @@ smooth-edge.gp: $(top_builddir)/config.s
+ 	rm -rf $$backupdir; exit $$rc
+ 
+ .texi.dvi:
+-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
++	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS:" \
+ 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+ 	$(TEXI2DVI) $<
+ 
+ .texi.pdf:
+-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
++	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS:" \
+ 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+ 	$(TEXI2PDF) $<
+ 
+@@ -450,7 +450,7 @@ mostlyclean-1:
+ maintainer-clean-1:
+ 	-rm -f $(srcdir)/stamp-1 $(srcdir)/versenfuse.texi
+ .dvi.ps:
+-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
++	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS:" \
+ 	$(DVIPS) -o $@ $<
+ 
+ uninstall-dvi-am:
+@@ -788,7 +788,7 @@ uninstall-am: uninstall-dvi-am uninstall
+ 	uninstall-dvi-am uninstall-html-am uninstall-info-am \
+ 	uninstall-pdf-am uninstall-ps-am
+ 
+-export TEXINPUTS=$(top_builddir):$(srcdir)
++export TEXINPUTS=$(top_builddir):$(srcdir):
+ 
+ # Phony Targets
+ 
diff --git a/enblend.spec b/enblend.spec
index 1c12171..834c73e 100644
--- a/enblend.spec
+++ b/enblend.spec
@@ -13,10 +13,13 @@ 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 
+%if 0%{?fedora} >= 17
 BuildRequires: texlive-latex-fonts texlive-thumbpdf
 %endif
 
+# fix pdf generation with recent texlive, set TEXINPUTS properly (upstreamable)
+Patch1: enblend-enfuse-4.1.1-TEXINPUTS.patch
+
 Requires(post): info
 Requires(preun): info
 
@@ -38,10 +41,17 @@ PDF usage documentation for the enblend and enfuse command line tools
 %prep
 %setup -q -n enblend-enfuse-%{version}
 
+%patch1 -p1 -b .TEXINPUTS
+
 %build
 %configure --with-boost-filesystem
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
-cd doc && make pdf
+
+# set MAKEINFO to allow use of pregenerated .info files, and avoid
+# problems with texinfo-5.x ( see https://bugzilla.redhat.com/919935 )
+(cd doc && make pdf MAKEINFO=/bin/true )
+
+make %{?_smp_mflags}
+
 
 %install
 rm -rf %{buildroot}
@@ -78,7 +88,7 @@ fi
 
 %changelog
 * Mon Mar 11 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.1.1-3
-- rebuild (OpenEXR)
+- avoid/fix pitfalls associated with texinfo-5.1 (#919935)
 
 * Sun Mar 10 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.1.1-2
 - rebuild (OpenEXR)