From 202cade2c70447d825b6e37357eefc8faadd66d6 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 16:58:20 +0100
Subject: [PATCH] updated rpm macros files [release 2.7.18-2mamba;Fri Jan 01
 2021]

---
 python-2.7-macros.python |  3 +--
 python-macros.python     | 23 +----------------------
 python27.spec            | 12 +++++++-----
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/python-2.7-macros.python b/python-2.7-macros.python
index 88eae1c..ac6df6f 100644
--- a/python-2.7-macros.python
+++ b/python-2.7-macros.python
@@ -22,5 +22,4 @@ find %1 -name '*.pyc' -name '*.pyo' -exec rm -f {} \\; \
 %py27_requires(d) \
 %define maxver %(%{__python27} -c "import sys; a,b=sys.version_info[:2]; print '%%d.%%d'%%(a,b+1)" 2>/dev/null || echo PYTHON-NOT-FOUND) \
 BuildRequires: python27, libpython27-devel \
-PreReq: python27 >= %{python27_version}, python27 < %{maxver}
-
+Requires(pre): python27 >= %{python27_version}, python27 < %{maxver}
diff --git a/python-macros.python b/python-macros.python
index d7782ad..26333ad 100644
--- a/python-macros.python
+++ b/python-macros.python
@@ -23,25 +23,4 @@ find %1 -name '*.pyc' -name '*.pyo' -exec rm -f {} \\; \
 %py_requires(d) \
 %define maxver %(%{__python} -c "import sys; a,b=sys.version_info[:2]; print '%%d.%%d'%%(a,b+1)" 2>/dev/null || echo PYTHON-NOT-FOUND) \
 BuildRequires: python27, libpython27-devel \
-PreReq: python27 >= %{python_version}, python < %{maxver}
-
-%pyver_package \
-%define pyver           %{with_pyver} \
-%define pyappend        py%{with_pyver} \
-%define __python        %(rpm --eval %{__python%{pyver}}) \
-%define python_sitearch %(rpm --eval %{python%{with_pyver}_sitearch}) \
-%define python_sitelib  %(rpm --eval %{python%{with_pyver}_sitelib}) \
-%define python_inc      %(rpm --eval %{python%{with_pyver}_inc}) \
-%define python_version  %(rpm --eval %{python%{with_pyver}_version}) \
-%define python_provides %(rpm --eval %{python%{with_pyver}_provides}) \
-%define python_requires %(rpm --eval %{python%{with_pyver}_requires}) \
-%define py_requires     %(rpm --eval %{py%{with_pyver}_requires}) \
-\
-%package %{pyappend} \
-Group:         System/Libraries/Python \
-Summary:       %{summary} \
-%py_requires \
-\
-%description %{pyappend} \
-%{summary} \
-
+Requires(pre): python27 >= %{python_version}, python < %{maxver}
diff --git a/python27.spec b/python27.spec
index 0a80cbe..4a72398 100644
--- a/python27.spec
+++ b/python27.spec
@@ -7,7 +7,7 @@
 %define        __libdir   %{_libdir}
 Name:          python27
 Version:       2.7.18
-Release:       1mamba
+Release:       2mamba
 Summary:       An interpreted, interactive, object-oriented programming language
 Group:         Applications/Development
 Vendor:        openmamba
@@ -48,15 +48,14 @@ BuildRequires: latex2html >= 2002
 BuildRequires: tetex >= 3.0
 BuildRequires: libtk >= 8.4.11
 BuildRequires: libbluez-devel >= 2.21
-BuildRequires: python-Sphinx
-BuildRequires: python-Jinja2
+#BuildRequires: python-Sphinx
+#BuildRequires: python-Jinja2
 #%endif
 Requires:      %{libname} = %{?epoch:epoch:}%{version}-%{release}
 Provides:      python-abi = %{majversion}
 Provides:      python(abi) = %{majversion}
 Provides:      /usr/bin/python
-Provides:      python
-Obsoletes:     python
+Provides:      python = %{?epoch:epoch:}%{version}-%{release}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -366,6 +365,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Jan 01 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.7.18-2mamba
+- updated rpm macros files
+
 * Fri Nov 27 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.7.18-1mamba
 - update to 2.7.18