diff --git a/.gitignore b/.gitignore index 8269ad4..5474a95 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /automaton-1.2.0.tar.gz /automaton-1.4.0.tar.gz /automaton-1.5.0.tar.gz +/automaton-1.14.0.tar.gz diff --git a/python-automaton.spec b/python-automaton.spec index 6f03a5c..739dcc4 100644 --- a/python-automaton.spec +++ b/python-automaton.spec @@ -6,8 +6,8 @@ %endif Name: python-%{pypi_name} -Version: 1.5.0 -Release: 5%{?dist} +Version: 1.14.0 +Release: 1%{?dist} Summary: Friendly state machines for python License: ASL 2.0 @@ -22,14 +22,17 @@ Friendly state machines for python. Summary: Friendly state machines for python %{?python_provide:%python_provide python2-%{pypi_name}} BuildRequires: python2-devel -BuildRequires: python-pbr -BuildRequires: python-sphinx -BuildRequires: python-oslo-sphinx - -Requires: python-pbr >= 1.6 -Requires: python-six >= 1.9.0 -Requires: python-debtcollector >= 1.2.0 -Requires: python-prettytable +BuildRequires: python2-pbr +BuildRequires: git +BuildRequires: graphviz +BuildRequires: python2-sphinx +BuildRequires: python2-openstackdocstheme +BuildRequires: python2-oslo-sphinx +BuildRequires: python2-prettytable + +Requires: python2-pbr >= 2.0.0 +Requires: python2-six >= 1.10.0 +Requires: python2-prettytable %description -n python2-%{pypi_name} Friendly state machines for python. @@ -40,12 +43,9 @@ Summary: Friendly state machines for python %{?python_provide:%python_provide python3-%{pypi_name}} BuildRequires: python3-devel BuildRequires: python3-pbr -BuildRequires: python3-sphinx -BuildRequires: python3-oslo-sphinx -Requires: python3-pbr >= 1.6 -Requires: python3-six >= 1.9.0 -Requires: python3-debtcollector >= 1.2.0 +Requires: python3-pbr >= 2.0.0 +Requires: python3-six >= 1.10.0 Requires: python3-prettytable %description -n python3-%{pypi_name} @@ -59,7 +59,7 @@ Summary: Friendly state machines for python - documentation Friendly state machines for python (documentation) %prep -%setup -q -n %{pypi_name}-%{upstream_version} +%autosetup -n %{pypi_name}-%{upstream_version} -S git %build %if 0%{?with_python3} @@ -68,9 +68,9 @@ Friendly state machines for python (documentation) %py2_build # generate html docs -sphinx-build doc/source html +%{__python2} setup.py build_sphinx -b html # remove the sphinx-build leftovers -rm -rf html/.{doctrees,buildinfo} +rm -rf doc/build/html/.{doctrees,buildinfo} %install %if 0%{?with_python3} @@ -79,24 +79,27 @@ rm -rf html/.{doctrees,buildinfo} %py2_install %files -n python2-%{pypi_name} -%doc html README.rst +%doc README.rst %license LICENSE %{python2_sitelib}/%{pypi_name} %{python2_sitelib}/*.egg-info %if 0%{?with_python3} %files -n python3-%{pypi_name} -%doc html README.rst +%doc README.rst %license LICENSE %{python3_sitelib}/%{pypi_name} %{python3_sitelib}/*.egg-info %endif %files -n python-%{pypi_name}-doc -%doc html +%doc doc/build/html %license LICENSE %changelog +* Thu May 17 2018 Matthias Runge - 1.14.0-1 +- sync with OpenStack release Queens + * Fri Feb 09 2018 Fedora Release Engineering - 1.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 7259902..d2654bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d3068f9a9722e2a2a2a04d178e4ac6f automaton-1.5.0.tar.gz +SHA512 (automaton-1.14.0.tar.gz) = 59a2836cc0a2e0f21179c932605a191c0e72f981fd37bfe78bc56f9a453ecde07d674256b90ad83441fbd2588a15363a443f221ff567437c22db78b2c5d11383