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