[enblend] try using pregenerated docs
Rex Dieter
rdieter at fedoraproject.org
Mon Mar 25 18:41:34 UTC 2013
commit 1b6513dd07079fda305d2439c49c532bdb29b432
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Mar 25 13:40:50 2013 -0500
try using pregenerated docs
.gitignore | 1 +
enblend.spec | 16 +++++++++-------
sources | 1 +
3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c9272bd..682c47f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
enblend-enfuse-4.0.tar.gz
/enblend-enfuse-4.1.tar.gz
/enblend-enfuse-4.1.1.tar.gz
+/enblend-enfuse-doc-4.1.1.tar.gz
diff --git a/enblend.spec b/enblend.spec
index fac2d1a..6e33a49 100644
--- a/enblend.spec
+++ b/enblend.spec
@@ -1,6 +1,7 @@
# re-enable pdf doc generation when/if ghostscript/texi2pdf is fixed,
# https://bugzilla.redhat.com/921706
+# else, use pregenerated docs
%if 0%{?fedora} < 19
%define doc 1
%endif
@@ -11,7 +12,7 @@ Version: 4.1.1
Release: 3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
-Source: http://downloads.sourceforge.net/enblend/enblend-enfuse-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/enblend/enblend-enfuse-%{version}.tar.gz
URL: http://enblend.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtiff-devel boost-devel lcms2-devel plotutils-devel
@@ -24,6 +25,9 @@ BuildRequires: help2man ImageMagick texinfo-tex gsl-devel
BuildRequires: texlive-latex-fonts texlive-thumbpdf
%endif
+# pregenerated info/pdf docs
+Source1: enblend-enfuse-doc-4.1.1.tar.gz
+
# fix pdf generation with recent texlive, set TEXINPUTS properly (upstreamable)
Patch1: enblend-enfuse-4.1.1-TEXINPUTS.patch
@@ -46,7 +50,7 @@ Group: Documentation
PDF usage documentation for the enblend and enfuse command line tools
%prep
-%setup -q -n enblend-enfuse-%{version}
+%setup -q -n enblend-enfuse-%{version} %{!?doc:-a 1}
%patch1 -p1 -b .TEXINPUTS
@@ -55,16 +59,16 @@ PDF usage documentation for the enblend and enfuse command line tools
# set MAKEINFO to allow use of pregenerated .info files, and avoid
# problems with texinfo-5.x ( see https://bugzilla.redhat.com/919935 )
-make %{?_smp_mflags} FIG2DEV=/bin/true MAKEINFO=/bin/true
+make %{?_smp_mflags} %{!?doc:FIG2DEV=/bin/true MAKEINFO=/bin/true}
%if 0%{?doc}
-(cd doc && make pdf MAKEINFO=/bin/true )
+(cd doc && make pdf )
%endif
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} FIG2DEV=/bin/true MAKEINFO=/bin/true
+make install DESTDIR=%{buildroot} %{!?doc:FIG2DEV=/bin/true MAKEINFO=/bin/true}
rm -f %{buildroot}%{_infodir}/dir
%clean
@@ -91,11 +95,9 @@ fi
%{_infodir}/enblend.*
%{_infodir}/enfuse.*
-%if 0%{?doc}
%files doc
%defattr(-,root,root,-)
%doc COPYING doc/enblend.pdf doc/enfuse.pdf
-%endif
%changelog
* Mon Mar 11 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.1.1-3
diff --git a/sources b/sources
index c3a6112..aa7fedd 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
9bc34f423f3bee35150ab593211da4a2 enblend-enfuse-4.1.1.tar.gz
+5888129338ba42f9e6561cf5cc281ca3 enblend-enfuse-doc-4.1.1.tar.gz
More information about the scm-commits
mailing list