diff --git a/python-txaio-1.0.2-sphinx-config_find-theme.patch b/python-txaio-1.0.2-sphinx-config_find-theme.patch deleted file mode 100644 index 69c2716..0000000 --- a/python-txaio-1.0.2-sphinx-config_find-theme.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- doc/conf.py.orig 2015-08-08 15:43:06.296973317 +0200 -+++ doc/conf.py 2015-08-08 15:43:35.857320995 +0200 -@@ -16,6 +16,7 @@ - import sys - import os - import shlex -+import alabaster - - # If extensions (or modules to document with autodoc) are in another directory, - # add these directories to sys.path here. If the directory is relative to the -@@ -127,7 +128,7 @@ - #html_theme_options = {} - - # Add any paths that contain custom themes here, relative to this directory. --#html_theme_path = [] -+html_theme_path = [alabaster.get_path()] - - # The name for this set of Sphinx documents. If None, it defaults to - # " v documentation". diff --git a/python-txaio-1.0.3-sphinx-config_find-theme.patch b/python-txaio-1.0.3-sphinx-config_find-theme.patch new file mode 100644 index 0000000..69c2716 --- /dev/null +++ b/python-txaio-1.0.3-sphinx-config_find-theme.patch @@ -0,0 +1,19 @@ +--- doc/conf.py.orig 2015-08-08 15:43:06.296973317 +0200 ++++ doc/conf.py 2015-08-08 15:43:35.857320995 +0200 +@@ -16,6 +16,7 @@ + import sys + import os + import shlex ++import alabaster + + # If extensions (or modules to document with autodoc) are in another directory, + # add these directories to sys.path here. If the directory is relative to the +@@ -127,7 +128,7 @@ + #html_theme_options = {} + + # Add any paths that contain custom themes here, relative to this directory. +-#html_theme_path = [] ++html_theme_path = [alabaster.get_path()] + + # The name for this set of Sphinx documents. If None, it defaults to + # " v documentation". diff --git a/python-txaio.spec b/python-txaio.spec index d31b55a..b4ee760 100644 --- a/python-txaio.spec +++ b/python-txaio.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Compatibility API between asyncio/Twisted/Trollius License: MIT @@ -10,8 +10,7 @@ URL: https://pypi.python.org/pypi/%{pypi_name} Source0: https://pypi.python.org/packages/source/t/%{pypi_name}/%{pypi_name}-%{version}.tar.gz Patch0: python-txaio-%{version}-sphinx-config_find-theme.patch -BuildArch: noarch - +BuildArch: noarch BuildRequires: python2-devel BuildRequires: pytest BuildRequires: python-pytest-cov @@ -21,18 +20,27 @@ BuildRequires: python-sphinx BuildRequires: python2-sphinx-theme-alabaster BuildRequires: python-six BuildRequires: python-twisted + +%description +Helper library for writing code that runs unmodified on both Twisted and +asyncio. + + +%package -n python2-%{pypi_name} +Summary: Compatibility API between asyncio/Twisted/Trollius +BuildArch: noarch Requires: python-twisted Requires: python-six -Provides: python2-%{pypi_name} = %{version}-%{release} +%{?python_provide:%python_provide python2-%{pypi_name}} -%description +%description -n python2-%{pypi_name} Helper library for writing code that runs unmodified on both Twisted and asyncio. %package -n python3-%{pypi_name} Summary: Compatibility API between asyncio/Twisted/Trollius -BuildArch: noarch +BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-pytest BuildRequires: python3-pytest-cov @@ -42,6 +50,7 @@ BuildRequires: python3-sphinx BuildRequires: python3-sphinx-theme-alabaster BuildRequires: python3-six Requires: python3-six +%{?python_provide:%python_provide python3-%{pypi_name}} %description -n python3-%{pypi_name} Helper library for writing code that runs unmodified on both Twisted and @@ -95,7 +104,7 @@ PYTHONPATH=$PYTHONPATH:. coverage3 run -p --source=txaio /usr/bin/py.test-%{pyth PYTHONPATH=$PYTHONPATH:. coverage2 run -p --source=txaio /usr/bin/py.test-%{python2_version} -s -%files +%files -n python2-%{pypi_name} %license LICENSE %doc README.rst %{python2_sitelib}/%{pypi_name}-%{version}-py%{python2_version}.egg-info/ @@ -114,6 +123,9 @@ PYTHONPATH=$PYTHONPATH:. coverage2 run -p --source=txaio /usr/bin/py.test-%{pyth %changelog +* Sat Aug 15 2015 Julien Enselme - 1.0.3-2 +- Move python2 package in its own subpackage + * Sat Aug 15 2015 Julien Enselme - 1.0.3-1 - Update to 1.0.3