From 273d4fb0f6fa6a65ee1db4810654df25c7917646393a73b880814dc3bc03ee3b Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 19 Apr 2017 02:23:58 +0000 Subject: [PATCH 1/2] Accepting request 489196 from home:TheBlackCat:branches:devel:languages:python - Implement single-spec version. OBS-URL: https://build.opensuse.org/request/show/489196 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Paste?expand=0&rev=15 --- python-Paste.changes | 5 ++++ python-Paste.spec | 54 +++++++++++++++++++++++++++----------------- 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/python-Paste.changes b/python-Paste.changes index d2e7e17..6fec40d 100644 --- a/python-Paste.changes +++ b/python-Paste.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 19 02:23:02 UTC 2017 - toddrme2178@gmail.com + +- Implement single-spec version. + ------------------------------------------------------------------- Fri Jun 3 15:31:42 UTC 2016 - tbechtold@suse.com diff --git a/python-Paste.spec b/python-Paste.spec index 15d9566..58e622b 100644 --- a/python-Paste.spec +++ b/python-Paste.spec @@ -1,7 +1,7 @@ # # spec file for package python-Paste # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,9 @@ # +%bcond_without tests + +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-Paste Version: 2.0.3 Release: 0 @@ -23,27 +26,32 @@ Url: http://pythonpaste.org Summary: Tools for using a Web Server Gateway Interface stack License: MIT Group: Development/Languages/Python -Source: https://pypi.io/packages/source/P/Paste/Paste-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/P/Paste/Paste-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python-devel -BuildRequires: python-setuptools -# Documentation build requirements: -BuildRequires: python-Sphinx -# Test build requirements: -BuildRequires: python-flup -BuildRequires: python-nose +BuildRequires: fdupes +BuildRequires: python-rpm-macros +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module flup} BuildRequires: python-python-openid -BuildRequires: python-six +BuildRequires: python3-python3-openid +BuildRequires: %{python_module six > 1.4.0} +# Documentation build requirements: +BuildRequires: python3-Sphinx +# Test build requirements: +BuildRequires: %{python_module nose} Requires: python-flup -Requires: python-python-openid Requires: python-six > 1.4.0 +%ifpython2 +Requires: python-python-openid +%endif +%ifpython3 +Requires: python3-python3-openid +%endif Provides: python-paste = %{version} Obsoletes: python-paste < %{version} -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif +%python_subpackages %description These provide several pieces of "middleware" (or filters) that can be nested @@ -61,18 +69,22 @@ rm paste/httpserver.py.orig rm paste/util/template.py.orig %build -python setup.py build -python setup.py build_sphinx && rm build/sphinx/html/.buildinfo +%python_build +python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} +%if %{with tests} %check -python setup.py -q test +%python_exec setup.py -q test +%endif -%files +%files %{python_files} %defattr(-,root,root,-) -%doc build/sphinx/html docs/license.txt +%doc docs/license.txt +%doc build/sphinx/html/ %{python_sitelib}/* %changelog From dc8eed1525df4558a8671386c71468c315e007a34b1cbe95c9c3d9805aa97752 Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 5 May 2017 22:00:20 +0000 Subject: [PATCH 2/2] Accepting request 493091 from home:TheBlackCat:branches:devel:languages:python - Fix Provides/Obsoletes. OBS-URL: https://build.opensuse.org/request/show/493091 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Paste?expand=0&rev=16 --- python-Paste.changes | 5 +++++ python-Paste.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/python-Paste.changes b/python-Paste.changes index 6fec40d..e59aab4 100644 --- a/python-Paste.changes +++ b/python-Paste.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 5 21:59:21 UTC 2017 - toddrme2178@gmail.com + +- Fix Provides/Obsoletes. + ------------------------------------------------------------------- Wed Apr 19 02:23:02 UTC 2017 - toddrme2178@gmail.com diff --git a/python-Paste.spec b/python-Paste.spec index 58e622b..afc80de 100644 --- a/python-Paste.spec +++ b/python-Paste.spec @@ -19,6 +19,7 @@ %bcond_without tests %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python Name: python-Paste Version: 2.0.3 Release: 0 @@ -44,12 +45,12 @@ Requires: python-flup Requires: python-six > 1.4.0 %ifpython2 Requires: python-python-openid +Provides: %{oldpython}-paste = %{version} +Obsoletes: %{oldpython}-paste < %{version} %endif %ifpython3 Requires: python3-python3-openid %endif -Provides: python-paste = %{version} -Obsoletes: python-paste < %{version} BuildArch: noarch %python_subpackages