|
 |
fe4262 |
diff --git a/Makefile.rhnlib b/Makefile.rhnlib
|
|
|
fe4262 |
index 03e27d0..e666769 100644
|
|
|
fe4262 |
--- a/Makefile.rhnlib
|
|
|
fe4262 |
+++ b/Makefile.rhnlib
|
|
|
fe4262 |
@@ -1,7 +1,7 @@
|
|
|
fe4262 |
# Makefile for the rhn modules
|
|
|
fe4262 |
#
|
|
|
fe4262 |
|
|
|
fe4262 |
-PYTHON = /usr/bin/python
|
|
|
fe4262 |
+PYTHON = /usr/bin/python3
|
|
|
fe4262 |
|
|
|
fe4262 |
NAME = rhnlib
|
|
|
fe4262 |
VERSION = $(call _get_tag,VERSION)
|
|
|
fe4262 |
diff --git a/rhnlib.spec b/rhnlib.spec
|
|
|
fe4262 |
index f5eb7fd..1581072 100644
|
|
|
fe4262 |
--- a/rhnlib.spec
|
|
|
fe4262 |
+++ b/rhnlib.spec
|
|
|
fe4262 |
@@ -7,7 +7,7 @@
|
|
|
fe4262 |
Summary: Python libraries for the Spacewalk project
|
|
|
fe4262 |
Name: rhnlib
|
|
|
fe4262 |
Version: 2.8.6
|
|
|
fe4262 |
-Release: 3%{?dist}
|
|
|
fe4262 |
+Release: 4%{?dist}
|
|
|
fe4262 |
URL: https://github.com/spacewalkproject/spacewalk
|
|
|
fe4262 |
Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz
|
|
|
fe4262 |
|
|
|
fe4262 |
@@ -16,18 +16,8 @@ License: GPLv2
|
|
|
fe4262 |
%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1}
|
|
|
fe4262 |
BuildArch: noarch
|
|
|
fe4262 |
%endif
|
|
|
fe4262 |
-BuildRequires: python-devel
|
|
|
fe4262 |
-Provides: python2-rhnlib = %{version}-%{release}
|
|
|
fe4262 |
-%{?python_provide:%python_provide python2-rhnlib}
|
|
|
fe4262 |
|
|
|
fe4262 |
-Requires: pyOpenSSL
|
|
|
fe4262 |
-Conflicts: rhncfg < 5.10.45
|
|
|
fe4262 |
-Conflicts: spacewalk-proxy-installer < 1.3.2
|
|
|
fe4262 |
-Conflicts: rhn-client-tools < 1.3.3
|
|
|
fe4262 |
-Conflicts: rhn-custom-info < 5.4.7
|
|
|
fe4262 |
-Conflicts: rhnpush < 5.5.10
|
|
|
fe4262 |
-Conflicts: rhnclient < 0.10
|
|
|
fe4262 |
-Conflicts: spacewalk-proxy < 1.3.6
|
|
|
fe4262 |
+Requires: python3-rhnlib
|
|
|
fe4262 |
|
|
|
fe4262 |
%description
|
|
|
fe4262 |
rhnlib is a collection of python modules used by the Spacewalk (http://spacewalk.redhat.com) software.
|
|
|
fe4262 |
@@ -67,7 +57,6 @@ make -f Makefile.rhnlib
|
|
|
fe4262 |
|
|
|
fe4262 |
|
|
|
fe4262 |
%install
|
|
|
fe4262 |
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --prefix=%{_prefix}
|
|
|
fe4262 |
%if 0%{?build_py3}
|
|
|
fe4262 |
%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --prefix=%{_prefix}
|
|
|
fe4262 |
%endif
|
|
|
fe4262 |
@@ -77,8 +66,6 @@ make -f Makefile.rhnlib
|
|
|
fe4262 |
|
|
|
fe4262 |
|
|
|
fe4262 |
%files
|
|
|
fe4262 |
-%doc ChangeLog COPYING README TODO
|
|
|
fe4262 |
-%{python_sitelib}/*
|
|
|
fe4262 |
|
|
|
fe4262 |
%if 0%{?build_py3}
|
|
|
fe4262 |
%files -n python3-rhnlib
|
|
|
fe4262 |
@@ -87,6 +74,11 @@ make -f Makefile.rhnlib
|
|
|
fe4262 |
%endif
|
|
|
fe4262 |
|
|
|
fe4262 |
%changelog
|
|
|
fe4262 |
+* Tue Apr 17 2018 Tomas Kasparek <tkasparek@redhat.com> 2.8.6-4
|
|
|
fe4262 |
+- don't package python2 files for rhnlib (tkasparek@redhat.com)
|
|
|
fe4262 |
+- be compliant with new packaging guidelines when requiring python2 packages
|
|
|
fe4262 |
+ (tkasparek@redhat.com)
|
|
|
fe4262 |
+
|
|
|
fe4262 |
* Tue Feb 20 2018 Tomas Kasparek <tkasparek@redhat.com> 2.8.6-3
|
|
|
fe4262 |
- rhel8 utilizes python3 (tkasparek@redhat.com)
|
|
|
fe4262 |
|