diff --git a/.gitignore b/.gitignore index cdde900..168f551 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /sphinxcontrib-httpdomain-1.1.7.tar.gz +/sphinxcontrib-httpdomain-1.1.8.tar.gz diff --git a/python-sphinxcontrib-httpdomain.spec b/python-sphinxcontrib-httpdomain.spec index 9504f7e..6294a80 100644 --- a/python-sphinxcontrib-httpdomain.spec +++ b/python-sphinxcontrib-httpdomain.spec @@ -6,8 +6,8 @@ %global upstream_name sphinxcontrib-httpdomain Name: python-%{upstream_name} -Version: 1.1.7 -Release: 2%{?dist} +Version: 1.1.8 +Release: 1%{?dist} Summary: Sphinx domain for documenting HTTP APIs License: BSD URL: http://packages.python.org/sphinxcontrib-httpdomain/ @@ -23,6 +23,13 @@ Group: Development/Libraries BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %endif +# This package is not usable without Sphinx, but EPEL5 and EPEL6 have +# both python-sphinx and python-sphinx10, and we don't want to require one or +# the other in particular. +%if 0%{?fedora} +Requires: python-sphinx +%endif + %description Using this Sphinx domain you can document your HTTP API. It includes support for generating documentation from Flask routing tables. @@ -34,6 +41,7 @@ rm -rf %{buildroot} %prep %setup -q -n %{upstream_name}-%{version} +rm -r *.egg-info %if ! (0%{?rhel} >= 7 || 0%{?fedora}) %patch0 -p1 %endif @@ -48,10 +56,14 @@ rm -rf %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot} %files -%doc README LICENSE +%doc README.rst LICENSE %{python_sitelib}/* %changelog +* Mon Apr 22 2013 Dan Callaghan - 1.1.8-1 +- new upstream release 1.1.8 +- require python-sphinx (except on EPEL5/6) + * Mon Mar 04 2013 Dan Callaghan - 1.1.7-2 - support EPEL5 and EPEL6 diff --git a/sources b/sources index 3d255aa..e55749c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12704b125541580477b6b4df6780fbe7 sphinxcontrib-httpdomain-1.1.7.tar.gz +4409fd06029412c27cef3b8ab9e8557c sphinxcontrib-httpdomain-1.1.8.tar.gz