diff --git a/.gitignore b/.gitignore index 1c9ad86..a8db310 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /python-fedora-0.6.1.tar.gz /python-fedora-0.6.2.tar.gz /python-fedora-0.6.4.tar.gz +/python-fedora-0.7.0.tar.gz diff --git a/python-fedora.spec b/python-fedora.spec index 38bf582..85afc48 100644 --- a/python-fedora.spec +++ b/python-fedora.spec @@ -9,14 +9,15 @@ #%%global prerel c2 Name: python-fedora -Version: 0.6.4 -Release: 2%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Summary: Python modules for talking to Fedora Infrastructure Services Group: Development/Languages License: LGPLv2+ URL: https://fedorahosted.org/python-fedora/ Source0: https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}%{?prerel}.tar.gz +Patch0: python-fedora-python3-print-statements.patch BuildArch: noarch @@ -173,10 +174,15 @@ Account System. %prep %setup -q -n %{name}-%{version}%{?prerel} +%patch0 -p1 # For https://bugzilla.redhat.com/show_bug.cgi?id=1282571 sed -i "s/, 'lockfile'//" setup.py +# Pull in the old compat version of cherrypy to build the tg1 docs. +cp setup.py setup_docs.py +sed -i 's/import sys/import sys\n__requires__ = ["CherryPy < 3.0"]; import pkg_resources/' setup_docs.py + %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -194,8 +200,9 @@ popd %endif %{__python2} setup.py build -%{__python2} setup.py build_sphinx -%{__python2} releaseutils.py build_catalogs + +%{__python2} setup_docs.py build_sphinx +#%{__python2} releaseutils.py build_catalogs %install %if 0%{?with_python3} @@ -271,6 +278,9 @@ rm -rf %{buildroot}%{python2_sitelib}/tests/ %{python2_sitelib}/flask_fas_openid.py* %changelog +* Thu Jan 07 2016 Ralph Bean - 0.7.0-1 +- new version + * Mon Jan 04 2016 Ralph Bean - 0.6.4-2 - Drop requirement on simplejson (RHBZ#1294543). diff --git a/sources b/sources index f9720cf..c7c27af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1d2e3f8305504e1b86be1b5ee30dbaa3 python-fedora-0.6.4.tar.gz +5b9940058f6a3dd210e4187bd83a3ed4 python-fedora-0.7.0.tar.gz