From 0a44b5d2568dbca64cb60c23ae8f98540637a3f3eddc6be2fcd327070f757968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 16 Jul 2019 10:55:33 +0000
Subject: [PATCH] Accepting request 715510 from home:jayvdb:ruamel

This and ruamel.yaml are the last two packages in d-l-py to use --single-version-externally-managed

Also there is another group ruamel.std which are needed, and subpackages under ruamel.yaml that are useful

c.f. https://github.com/adrienverge/yamllint/issues/62#issuecomment-510730103 and rest of issue

Most of the ruamel.* collection at https://build.opensuse.org/project/show/home:jayvdb:ruamel (about 50% being submitted as packaging requests now)

More of them at https://pypi.org/search/?q=ruamel&o=-created

OBS-URL: https://build.opensuse.org/request/show/715510
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ruamel.base?expand=0&rev=5
---
 python-ruamel.base.changes |  8 ++++++++
 python-ruamel.base.spec    | 28 ++++++++++++++++------------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/python-ruamel.base.changes b/python-ruamel.base.changes
index fe1adc9..f6ca24d 100644
--- a/python-ruamel.base.changes
+++ b/python-ruamel.base.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul 15 15:06:26 UTC 2019 - John Vandenberg <jayvdb@gmail.com>
+
+- Replace namespace nspkg.pth and --single-version-externally-managed
+  with a normal namespace __init__.py
+- Bumped version to 1.0.0+post1 due to incompatible namespace technique
+- Tidy spec
+
 -------------------------------------------------------------------
 Mon Apr 24 13:16:01 UTC 2017 - aloisio@gmx.com
 
diff --git a/python-ruamel.base.spec b/python-ruamel.base.spec
index 6aa4f6e..6bef7df 100644
--- a/python-ruamel.base.spec
+++ b/python-ruamel.base.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-ruamel.base
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,45 +12,49 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-ruamel.base
-Version:        1.0.0
+Version:        1.0.0+post1
 Release:        0
 Summary:        Shared ruamel routines
 License:        MIT
 Group:          Development/Languages/Python
 Url:            https://bitbucket.org/ruamel/base
-Source:         https://files.pythonhosted.org/packages/source/r/ruamel.base/ruamel.base-%{version}.tar.gz
+Source:         https://files.pythonhosted.org/packages/source/r/ruamel.base/ruamel.base-1.0.0.tar.gz
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %python_subpackages
 
 %description
-Shared code for ruamel implementations
+This is a common package for the "ruamel" namespace.
 
 %prep
-%setup -q -n ruamel.base-%{version}
+%setup -q -n ruamel.base-1.0.0
 rm -rf *.egg-info
+# https://bitbucket.org/ruamel/base/issues/1
+sed -i '/sys.exit/d' setup.py
+# Use normal namespaces with a __init__.py, so it is easier to
+# managed the ordereddict and yaml packages which also include .so files
+sed -i '/namespace_packages=/d' setup.py
 
 %build
 %python_build
 
 %install
-%python_install --single-version-externally-managed
+export RUAMEL_NO_PIP_INSTALL_CHECK=1
+%python_install
 %python_expand %fdupes -s %{buildroot}%{$python_sitelib}
 
 %files %{python_files}
-%defattr(-,root,root,-)
-%doc LICENSE README.rst
+%doc README.rst
+%license LICENSE
 %{python_sitelib}/ruamel
-%{python_sitelib}/ruamel.base-%{version}-py%{python_version}-nspkg.pth
-%{python_sitelib}/ruamel.base-%{version}-py%{python_version}.egg-info
+%{python_sitelib}/ruamel.base-1.0.0-py%{python_version}.egg-info
 
 %changelog