From 59eeef048a100468a4aac62a2e9eb8ad2741aff2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 30 Jul 2019 05:17:55 -0400 Subject: [PATCH] import rhnlib-2.8.6-8.module+el8.0.0.z+3494+e6f475f6 --- ...ib-2.8.6-7-el8-to-rhnlib-2.8.6-8-el8.patch | 36 +++++++++++++++++++ SPECS/rhnlib.spec | 10 +++--- 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 SOURCES/rhnlib-2.8.6-7-el8-to-rhnlib-2.8.6-8-el8.patch diff --git a/SOURCES/rhnlib-2.8.6-7-el8-to-rhnlib-2.8.6-8-el8.patch b/SOURCES/rhnlib-2.8.6-7-el8-to-rhnlib-2.8.6-8-el8.patch new file mode 100644 index 0000000..537b0dd --- /dev/null +++ b/SOURCES/rhnlib-2.8.6-7-el8-to-rhnlib-2.8.6-8-el8.patch @@ -0,0 +1,36 @@ +diff --git a/rhnlib.spec b/rhnlib.spec +index 38417c7..4877efc 100644 +--- a/rhnlib.spec ++++ b/rhnlib.spec +@@ -2,12 +2,10 @@ + %global build_py3 1 + %endif + +-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +- + Summary: Python libraries for the Spacewalk project + Name: rhnlib + Version: 2.8.6 +-Release: 7%{?dist} ++Release: 8%{?dist} + URL: https://github.com/spacewalkproject/spacewalk + Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz + +@@ -52,7 +50,6 @@ fi + + + %build +-#%{__python} setup.py build + make -f Makefile.rhnlib + + +@@ -74,6 +71,9 @@ make -f Makefile.rhnlib + %endif + + %changelog ++* Fri Jun 21 2019 Michael Mraka 2.8.6-8 ++- fixed build error: attempt to use unversioned python ++ + * Mon Feb 04 2019 Michael Mraka 2.8.6-7 + - Resolves: #1666099 - python3 is picky about bytes and string + diff --git a/SPECS/rhnlib.spec b/SPECS/rhnlib.spec index 5848c0f..dba4261 100644 --- a/SPECS/rhnlib.spec +++ b/SPECS/rhnlib.spec @@ -2,12 +2,10 @@ %global build_py3 1 %endif -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - Summary: Python libraries for the Spacewalk project Name: rhnlib Version: 2.8.6 -Release: 7%{?dist} +Release: 8%{?dist} URL: https://github.com/spacewalkproject/spacewalk Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz Patch0: rhnlib-2.8.6-1-to-rhnlib-2.8.6-2-el8.patch @@ -16,6 +14,7 @@ Patch2: rhnlib-2.8.6-3-el8-to-rhnlib-2.8.6-4-el8.patch Patch3: rhnlib-2.8.6-4-el8-to-rhnlib-2.8.6-5-el8.patch Patch4: rhnlib-2.8.6-5-el8-to-rhnlib-2.8.6-6-el8.patch Patch5: rhnlib-2.8.6-6-el8-to-rhnlib-2.8.6-7-el8.patch +Patch6: rhnlib-2.8.6-7-el8-to-rhnlib-2.8.6-8-el8.patch License: GPLv2 @@ -55,6 +54,7 @@ rhnlib is a collection of python modules used by the Spacewalk (http://spacewalk %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 if [ ! -e setup.py ]; then sed -e 's/@VERSION@/%{version}/' -e 's/@NAME@/%{name}/' setup.py.in > setup.py fi @@ -64,7 +64,6 @@ fi %build -#%{__python} setup.py build make -f Makefile.rhnlib @@ -86,6 +85,9 @@ make -f Makefile.rhnlib %endif %changelog +* Fri Jun 21 2019 Michael Mraka 2.8.6-8 +- fixed build error: attempt to use unversioned python + * Mon Feb 04 2019 Michael Mraka 2.8.6-7 - Resolves: #1666099 - python3 is picky about bytes and string