[python-pysb] Update to 1.0.1

[Zbigniew Jędrzejewski-Szmek]

commit 13c4c98b221e01fe1dcc55afd3c48cceef67533d
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Jan 19 10:03:19 2015 -0500

    Update to 1.0.1

 .gitignore                                       |    1 +
 0001-Add-sphinx.ext.autosummary-to-conf.py.patch |   26 -------------------
 python-pysb.spec                                 |   30 ++++++++++++---------
 sources                                          |    2 +-
 4 files changed, 19 insertions(+), 40 deletions(-)
---
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/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 <zbyszek at in.waw.pl> - 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 <zbyszek at in.waw.pl> - 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