From bafebe7159cea8c7a7798ca7469cf9972874c35f405400567a2a9bbabce726fe Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 24 Apr 2017 20:40:58 +0000 Subject: [PATCH 1/2] Accepting request 490861 from home:TheBlackCat:branches:devel:languages:python - Implement single-spec version. OBS-URL: https://build.opensuse.org/request/show/490861 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-prompt_toolkit?expand=0&rev=4 --- python-prompt_toolkit.changes | 5 +++++ python-prompt_toolkit.spec | 20 +++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/python-prompt_toolkit.changes b/python-prompt_toolkit.changes index 452863a..3cc64b2 100644 --- a/python-prompt_toolkit.changes +++ b/python-prompt_toolkit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 24 20:40:09 UTC 2017 - toddrme2178@gmail.com + +- Implement single-spec version. + ------------------------------------------------------------------- Mon Apr 3 14:32:58 UTC 2017 - toddrme2178@gmail.com diff --git a/python-prompt_toolkit.spec b/python-prompt_toolkit.spec index 1a7cead..a5235a6 100644 --- a/python-prompt_toolkit.spec +++ b/python-prompt_toolkit.spec @@ -16,6 +16,7 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-prompt_toolkit Version: 1.0.14 Release: 0 @@ -24,10 +25,13 @@ License: BSD-3-Clause Group: Development/Languages/Python Url: https://github.com/jonathanslenders/python-prompt-toolkit Source: https://files.pythonhosted.org/packages/source/p/prompt_toolkit/prompt_toolkit-%{version}.tar.gz -BuildRequires: python-Pygments -BuildRequires: python-devel -BuildRequires: python-six >= 1.9.0 -BuildRequires: python-wcwidth +BuildRequires: fdupes +BuildRequires: python-rpm-macros +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module Pygments} +BuildRequires: %{python_module six >= 1.9.0} +BuildRequires: %{python_module wcwidth} Requires: python-Pygments Requires: python-six >= 1.9.0 Requires: python-wcwidth @@ -35,6 +39,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Provides: python-python-prompt-toolkit = %{version} Obsoletes: python-python-prompt-toolkit < %{version} +%python_subpackages %description Prompt toolkit is a Library for building powerful interactive command @@ -44,12 +49,13 @@ lines in Python. %setup -q -n prompt_toolkit-%{version} %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} -%files +%files %{python_files} %defattr(-,root,root,-) %doc README.rst CHANGELOG %{python_sitelib}/* From 2cee4a50c3cf849b5e8f336eb917b11ffdb16459e4aa96bfb7d8505b8789dec5 Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 5 May 2017 22:01:04 +0000 Subject: [PATCH 2/2] Accepting request 493097 from home:TheBlackCat:branches:devel:languages:python - Fix Provides/Obsoletes. OBS-URL: https://build.opensuse.org/request/show/493097 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-prompt_toolkit?expand=0&rev=5 --- python-prompt_toolkit.changes | 5 +++++ python-prompt_toolkit.spec | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/python-prompt_toolkit.changes b/python-prompt_toolkit.changes index 3cc64b2..f077cbe 100644 --- a/python-prompt_toolkit.changes +++ b/python-prompt_toolkit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 5 21:56:34 UTC 2017 - toddrme2178@gmail.com + +- Fix Provides/Obsoletes + ------------------------------------------------------------------- Mon Apr 24 20:40:09 UTC 2017 - toddrme2178@gmail.com diff --git a/python-prompt_toolkit.spec b/python-prompt_toolkit.spec index a5235a6..456d05c 100644 --- a/python-prompt_toolkit.spec +++ b/python-prompt_toolkit.spec @@ -17,6 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python Name: python-prompt_toolkit Version: 1.0.14 Release: 0 @@ -37,8 +38,10 @@ Requires: python-six >= 1.9.0 Requires: python-wcwidth BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Provides: python-python-prompt-toolkit = %{version} -Obsoletes: python-python-prompt-toolkit < %{version} +%ifpython2 +Obsoletes: %{oldpython}-python-prompt-toolkit < %{version} +Provides: %{oldpython}-python-prompt-toolkit = %{version} +%endif %python_subpackages %description