From f031eb463caa45a0636c190b99b89309eabe18a5f7710710ecd9eb714fcbcc81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 12 Aug 2019 14:22:49 +0000 Subject: [PATCH 1/3] Accepting request 721987 from home:mcalabkova:branches:devel:languages:python - update to version 0.15.2 * Docutils 0.14.x is the last version supporting Python 2.4, 2.5, 3.1, and 3.2. * reStructured text: Allow embedded colons in field list field names (before, tokens like :this:example: were considered ordinary text). * Fixed a bug with the "trim" options of the "unicode" directive. OBS-URL: https://build.opensuse.org/request/show/721987 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=54 --- docutils-0.14.tar.gz | 3 --- docutils-0.15.2.tar.gz | 3 +++ python-docutils.changes | 10 ++++++++++ python-docutils.spec | 4 +++- 4 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 docutils-0.14.tar.gz create mode 100644 docutils-0.15.2.tar.gz diff --git a/docutils-0.14.tar.gz b/docutils-0.14.tar.gz deleted file mode 100644 index d5fe2c7..0000000 --- a/docutils-0.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274 -size 1727105 diff --git a/docutils-0.15.2.tar.gz b/docutils-0.15.2.tar.gz new file mode 100644 index 0000000..8ac0f02 --- /dev/null +++ b/docutils-0.15.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 +size 1797388 diff --git a/python-docutils.changes b/python-docutils.changes index 3220b57..1e6b33f 100644 --- a/python-docutils.changes +++ b/python-docutils.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Aug 9 09:53:07 UTC 2019 - Marketa Calabkova + +- update to version 0.15.2 + * Docutils 0.14.x is the last version supporting Python 2.4, 2.5, + 3.1, and 3.2. + * reStructured text: Allow embedded colons in field list field + names (before, tokens like :this:example: were considered ordinary text). + * Fixed a bug with the "trim" options of the "unicode" directive. + ------------------------------------------------------------------- Mon May 13 23:48:57 UTC 2019 - Tomáš Chvátal diff --git a/python-docutils.spec b/python-docutils.spec index dc23d97..ef0516d 100644 --- a/python-docutils.spec +++ b/python-docutils.spec @@ -26,7 +26,7 @@ %endif %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-docutils%{psuffix} -Version: 0.14 +Version: 0.15.2 Release: 0 Summary: Python Documentation Utilities License: Python-2.0 AND BSD-2-Clause AND GPL-2.0-or-later AND GPL-3.0-or-later AND SUSE-Public-Domain @@ -39,6 +39,8 @@ BuildRequires: %{python_module Pillow} BuildRequires: %{python_module Pygments} BuildRequires: %{python_module roman} %endif +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} BuildRequires: %{python_module xml} BuildRequires: fdupes BuildRequires: python-rpm-macros From 0298703d0ee2f95538e7acc558369de0b12a7045b6e5b2020b605183039733f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 12 Aug 2019 14:27:55 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=55 --- python-docutils.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/python-docutils.spec b/python-docutils.spec index ef0516d..b13be9f 100644 --- a/python-docutils.spec +++ b/python-docutils.spec @@ -34,12 +34,6 @@ Group: Development/Languages/Python URL: https://pypi.python.org/pypi/docutils/ Source: https://files.pythonhosted.org/packages/source/d/docutils/docutils-%{version}.tar.gz Source99: python-docutils-rpmlintrc -%if %{with test} -BuildRequires: %{python_module Pillow} -BuildRequires: %{python_module Pygments} -BuildRequires: %{python_module roman} -%endif -BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module xml} BuildRequires: fdupes @@ -51,6 +45,11 @@ Recommends: python-Pillow Recommends: python-Pygments Recommends: python-roman BuildArch: noarch +%if %{with test} +BuildRequires: %{python_module Pillow} +BuildRequires: %{python_module Pygments} +BuildRequires: %{python_module roman} +%endif %ifpython3 Provides: docutils = %{version} Obsoletes: docutils < %{version} @@ -83,7 +82,7 @@ mv test3 test%{python3_bin_suffix} %install %if !%{with test} %python_install -%python_expand %fdupes -s %{buildroot}%{$python_sitelib} +%python_expand %fdupes %{buildroot}%{$python_sitelib} # To avoid conflicts with the rst2html4 package mv %{buildroot}%{_bindir}/rst2html4 %{buildroot}%{_bindir}/rst2html4-docutils From 19c8e6ac64e6272c1b0f1b8d86c2219160ae903738262a193708d8c7523c1bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 16 Sep 2019 07:42:21 +0000 Subject: [PATCH 3/3] Accepting request 730819 from home:jayvdb:py3only - Skip the tests for the flavors not being built OBS-URL: https://build.opensuse.org/request/show/730819 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=56 --- python-docutils.changes | 5 +++++ python-docutils.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/python-docutils.changes b/python-docutils.changes index 1e6b33f..b6be5e1 100644 --- a/python-docutils.changes +++ b/python-docutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Sep 14 01:50:36 UTC 2019 - John Vandenberg + +- Skip the tests for the flavors not being built + ------------------------------------------------------------------- Fri Aug 9 09:53:07 UTC 2019 - Marketa Calabkova diff --git a/python-docutils.spec b/python-docutils.spec index b13be9f..77bab34 100644 --- a/python-docutils.spec +++ b/python-docutils.spec @@ -76,8 +76,12 @@ sed -i -e "1d" "docutils/writers/xetex/__init__.py" "docutils/writers/_html_base %python_build # test3 is generated from test during build +%if 0%{?have_python2} && ! 0%{?skip_python2} mv test test%{python2_bin_suffix} +%endif +%if 0%{?have_python3} && ! 0%{?skip_python3} mv test3 test%{python3_bin_suffix} +%endif %install %if !%{with test}