[ocaml-res] Revert "Disable latex/PDF doc generation as texlive is broken (RHBZ#919891)."

Richard W.M. Jones rjones at fedoraproject.org
Thu Aug 8 13:04:42 UTC 2013


commit 3b9873799889d2f79f4d5ca0c88ca21f886eaa47
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Aug 8 14:02:09 2013 +0100

    Revert "Disable latex/PDF doc generation as texlive is broken (RHBZ#919891)."
    
    And fix latex dependency:
    https://lists.fedoraproject.org/pipermail/devel/2013-August/187520.html
    
    This reverts commit 650c92d54b1d4cfa3488b5a4e8de9bb9bbbacef4.

 ocaml-res.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/ocaml-res.spec b/ocaml-res.spec
index 5d8bace..df0b80f 100644
--- a/ocaml-res.spec
+++ b/ocaml-res.spec
@@ -3,7 +3,7 @@
 
 Name:           ocaml-res
 Version:        3.2.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        OCaml library for resizing arrays and strings
 
 License:        LGPLv2+ with exceptions
@@ -15,6 +15,9 @@ ExcludeArch:    sparc64 s390 s390x
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
+BuildRequires:  ghostscript
+BuildRequires:  texlive-collection-latexrecommended
+BuildRequires:  texlive-preprint
 
 
 %description
@@ -46,9 +49,7 @@ developing applications that use %{name}.
 %build
 make
 
-# Generate only the HTML docs.
-make -C lib htdoc
-ln -sf lib/doc
+make doc
 
 
 %install
@@ -71,6 +72,7 @@ make install
 %files devel
 %doc LICENSE README.txt Changelog TODO
 %doc lib/doc/res/html
+%doc lib/doc/res/latex/*.dvi lib/doc/res/latex/*.ps lib/doc/res/latex/*.pdf
 %if %opt
 %{_libdir}/ocaml/res/*.a
 %{_libdir}/ocaml/res/*.cmxa
@@ -79,6 +81,9 @@ make install
 
 
 %changelog
+* Thu Aug  8 2013 Richard W.M. Jones <rjones at redhat.com> - 3.2.0-15
+- Re-enable latex/PDF doc generation.
+
 * Mon Aug  5 2013 Richard W.M. Jones <rjones at redhat.com> - 3.2.0-14
 - Disable latex/PDF doc generation as texlive is broken (RHBZ#919891).
 


More information about the scm-commits mailing list