diff --git a/.gitignore b/.gitignore index a5d468c..3f30f2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pysb-1.0.0.tar.gz +/pysb-1.0.1.tar.gz diff --git a/0001-Add-sphinx.ext.autosummary-to-conf.py.patch b/0001-Add-sphinx.ext.autosummary-to-conf.py.patch deleted file mode 100644 index 8b86def..0000000 --- a/0001-Add-sphinx.ext.autosummary-to-conf.py.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 65ea1fd63c1e813d04069fe4dfbd0400c2946316 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Tue, 6 Jan 2015 17:44:14 -0500 -Subject: [PATCH] Add sphinx.ext.autosummary to conf.py - -sphinx otherwise does not understand ..autosummary. ---- - doc/conf.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/conf.py b/doc/conf.py -index 172c99123f..bb5588be00 100644 ---- a/doc/conf.py -+++ b/doc/conf.py -@@ -28,7 +28,7 @@ sys.path.insert(0, os.path.abspath('..')) - # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. - extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.coverage', - 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig', 'numpydoc', -- 'sphinx.ext.viewcode'] -+ 'sphinx.ext.viewcode', 'sphinx.ext.autosummary'] - - # Add any paths that contain templates here, relative to this directory. - templates_path = ['_templates'] --- -2.1.0 - diff --git a/python-pysb.spec b/python-pysb.spec index 36aa331..c2482da 100644 --- a/python-pysb.spec +++ b/python-pysb.spec @@ -1,21 +1,22 @@ # Documentation cannot be built on epel7, python-numpydoc is missing -%global with_docs 0%{?fedora} +%global with_doc 0%{?fedora} -# Use the same directory of the main package for subpackage licence and docs +# Use the same directory of the main package for subpackage licence and doc %global _docdir_fmt %{name} Name: python-pysb -Version: 1.0.0 +Version: 1.0.1 Release: 1%{?dist} Summary: Rule-based modeling of biochemical systems as Python programs License: BSD URL: http://pysb.org/ Source0: https://pypi.python.org/packages/source/p/pysb/pysb-%{version}.tar.gz +Patch0: 0001-Mark-run_tutorial_a-executable-same-as-other-example.patch BuildArch: noarch BuildRequires: python2-devel # For building documentation -%if %{with_docs} +%if %{with_doc} BuildRequires: dvipng BuildRequires: python-sphinx BuildRequires: tex(latex) @@ -27,8 +28,6 @@ Requires: scipy Requires: python-matplotlib Requires: sympy Requires: python-pygraphviz -Patch0: 0001-Mark-run_tutorial_a-executable-same-as-other-example.patch -Patch1: 0001-Add-sphinx.ext.autosummary-to-conf.py.patch %description PySB is a framework for building mathematical models of biochemical @@ -44,21 +43,21 @@ accuracy. PySB also interoperates with standard scientific Python libraries such as NumPy, SciPy and SymPy enabling model simulation and analysis. -%if %{with_docs} -%package docs +%if %{with_doc} +%package doc Summary: HTML documentation for %{name} Group: Documentation Requires: %{name} = %{version}-%{release} Provides: bundled(jquery) +Obsoletes: %{name}-docs <= 1.0.1 -%description docs +%description doc This package contains HTML documentation for %{name}. %endif %prep %setup -q -n pysb-%{version} %patch0 -p1 -%patch1 -p1 # https://github.com/pysb/pysb/issues/100 sed -i -e "s|/usr/local/share/BioNetGen|%{perl_vendorlib}/BioNetGen|" \ -e "s|'c:/Program Files/BioNetGen',||" \ @@ -69,7 +68,7 @@ sed -i -s "1 s|/usr/bin/env python|%{__python2}|" pysb/examples/*.py pysb/tools/ python setup.py build # Build documentation -%if %{with_docs} +%if %{with_doc} make -C doc html rm doc/_build/html/.buildinfo %endif @@ -86,13 +85,18 @@ chmod +x %{buildroot}/%{python_sitelib}/pysb/tools/[a-z]*.py %{python_sitelib}/pysb-%{version}-*.egg-info %{_bindir}/pysb_export -%if %{with_docs} -%files docs +%if %{with_doc} +%files doc %license LICENSE.txt %doc doc/_build/html %endif %changelog +* Mon Jan 19 2015 Zbigniew Jędrzejewski-Szmek - 1.0.1-1 +- Update to 1.0.1 +- Remove merged patches +- Rename -docs do -doc following Packaging Guidelines + * Tue Jan 6 2015 Zbigniew Jędrzejewski-Szmek - 1.0.0-1 - Update to 1.0.0 (#1178418) - Add docs subpackage diff --git a/sources b/sources index c6ba3bb..a5a4068 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5ac00b0c0edf25bbc42640ad25b3852 pysb-1.0.0.tar.gz +8ee35ab7206fb41935c067369c014d82 pysb-1.0.1.tar.gz