[libsbml] Rename -docs to -doc

Zbigniew Jędrzejewski-Szmek zbyszek at fedoraproject.org
Mon Feb 9 15:02:32 UTC 2015


commit 14656c408ec47e58f168783d7eca992224e0049e
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Fri Feb 6 15:45:45 2015 -0500

    Rename -docs to -doc
    
    This is the preferred version according to
    https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#Documentation .

 libsbml.spec |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/libsbml.spec b/libsbml.spec
index f7a7d59..5db96f2 100644
--- a/libsbml.spec
+++ b/libsbml.spec
@@ -4,7 +4,7 @@
 %bcond_without java
 %bcond_without octave
 %bcond_without r
-%bcond_without docs
+%bcond_without doc
 %bcond_without check
 
 %ifnarch s390 s390x aarch64 ppc64 ppc64le
@@ -29,7 +29,7 @@
 
 Name:           libsbml
 Version:        5.11.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Systems Biology Markup Language library
 
 License:        LGPLv2+
@@ -171,8 +171,8 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 This package contains %{summary}.
 %endif
 
-%if %{with docs}
-%package        docs
+%if %{with doc}
+%package        doc
 BuildRequires:  doxygen
 BuildRequires:  doxygen-latex
 BuildRequires:  graphviz
@@ -181,7 +181,7 @@ Requires:       %{name} = %{version}-%{release}
 Provides:       bundled(jquery)
 BuildArch:      noarch
 
-%description    docs
+%description    doc
 This package contains %{summary}.
 %endif
 
@@ -278,14 +278,14 @@ make
 
 pushd ..
 %configure --disable-static \
-%if %{with docs}
+%if %{with doc}
            --with-doxygen \
 %endif
 %if %{with python}
            --with-python --with-python-interpreter=%{__python3} \
 %endif
            --enable-layout --enable-comp --enable-fbc --enable-qual
-%if %{with docs}
+%if %{with doc}
 make %{?_smp_mflags} docs
 %endif
 make %{?_smp_mflags} libsbml.pc
@@ -312,7 +312,7 @@ R CMD INSTALL -l %{buildroot}%{_libdir}/R/library build/src/bindings/r/%{rpkg}_%
 rm -rf %{buildroot}%{_libdir}/R/library/%{rpkg}/R.css
 %endif
 
-%if %{with docs}
+%if %{with doc}
 make install-docs DESTDIR=%{buildroot}
 mv %{buildroot}%{_pkgdocdir}-%{version} %{buildroot}%{_pkgdocdir}
 %endif
@@ -339,7 +339,7 @@ make -C build %{?_smp_mflags} check
 %{_libdir}/*.so.*
 ##This directory provides just some txt documentation files
 %exclude %{_datadir}/libsbml
-%if %{with docs}
+%if %{with doc}
 %exclude %{_pkgdocdir}/*-api
 %endif
 
@@ -403,18 +403,21 @@ make -C build %{?_smp_mflags} check
 %{_monodir}/libsbmlcsP/
 %endif
 
-%if %{with docs}
-%files docs
+%if %{with doc}
+%files doc
 %{_pkgdocdir}/cpp-api
 # Binding docs are here too, as a compromise. Making a separate
-# python-libsbml-docs seems overkill, but including them in an arched
+# python-libsbml-doc seems overkill, but including them in an arched
 # package is not nice.
 %{_pkgdocdir}/python-api
 %endif
 
 
 %changelog
-* Wed Feb  4 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 5.11.0-9
+* Fri Feb 06 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 5.11.0-10
+- Rename -doc to -docs, run make unparallized
+
+* Wed Feb 04 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 5.11.0-9
 - Apply upstream patch for arm test failures
 
 * Tue Feb 03 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 5.11.0-8


More information about the scm-commits mailing list