yifengyou / rpms / spacewalk-usix

Forked from rpms/spacewalk-usix 3 years ago
Clone

Blame SOURCES/spacewalk-usix-2.8.1-4-el8-to-spacewalk-usix-2.8.1-5-el8.patch

1a4649
diff --git a/spacewalk-usix.spec b/spacewalk-usix.spec
1a4649
index 2bf8720..1b550d5 100644
1a4649
--- a/spacewalk-usix.spec
1a4649
+++ b/spacewalk-usix.spec
1a4649
@@ -18,7 +18,7 @@
1a4649
 
1a4649
 Name:	    spacewalk-usix
1a4649
 Version:	2.8.1
1a4649
-Release:	4%{?dist}
1a4649
+Release:	5%{?dist}
1a4649
 Summary:	Spacewalk server and client nano six library
1a4649
 
1a4649
 License:	GPLv2
1a4649
@@ -33,16 +33,6 @@ Obsoletes: spacewalk-backend-usix < 2.8
1a4649
 %description
1a4649
 Library for writing code that runs on Python 2 and 3
1a4649
 
1a4649
-%package -n python2-%{name}
1a4649
-Summary: Spacewalk client micro six library
1a4649
-Provides: python2-spacewalk-backend-usix = %{version}-%{release}
1a4649
-Obsoletes: python2-spacewalk-backend-usix < 2.8
1a4649
-BuildRequires: python-devel
1a4649
-
1a4649
-%description -n python2-%{name}
1a4649
-Library for writing code that runs on Python 2 and 3
1a4649
-
1a4649
-%if 0%{?build_py3}
1a4649
 %package -n python3-%{name}
1a4649
 Summary: Spacewalk client micro six library
1a4649
 Provides: python3-spacewalk-backend-usix = %{version}-%{release}
1a4649
@@ -52,8 +42,6 @@ BuildRequires: python3-devel
1a4649
 %description -n python3-%{name}
1a4649
 Library for writing code that runs on Python 2 and 3
1a4649
 
1a4649
-%endif
1a4649
-
1a4649
 %prep
1a4649
 %setup -q
1a4649
 
1a4649
@@ -62,35 +50,16 @@ Library for writing code that runs on Python 2 and 3
1a4649
 %define debug_package %{nil}
1a4649
 
1a4649
 %install
1a4649
-install -m 0755 -d $RPM_BUILD_ROOT%{pythonrhnroot}/common
1a4649
-install -m 0644 __init__.py $RPM_BUILD_ROOT%{pythonrhnroot}/__init__.py
1a4649
-install -m 0644 common/__init__.py $RPM_BUILD_ROOT%{pythonrhnroot}/common/__init__.py
1a4649
-install -m 0644 common/usix.py* $RPM_BUILD_ROOT%{pythonrhnroot}/common/usix.py
1a4649
-
1a4649
-%if 0%{?build_py3}
1a4649
-install -d $RPM_BUILD_ROOT%{python3rhnroot}/common
1a4649
-cp $RPM_BUILD_ROOT%{pythonrhnroot}/__init__.py $RPM_BUILD_ROOT%{python3rhnroot}
1a4649
-cp $RPM_BUILD_ROOT%{pythonrhnroot}/common/__init__.py $RPM_BUILD_ROOT%{python3rhnroot}/common
1a4649
-cp $RPM_BUILD_ROOT%{pythonrhnroot}/common/usix.py $RPM_BUILD_ROOT%{python3rhnroot}/common
1a4649
-%endif
1a4649
+install -m 0755 -d $RPM_BUILD_ROOT%{python3rhnroot}/common
1a4649
+install -m 0644 __init__.py $RPM_BUILD_ROOT%{python3rhnroot}/__init__.py
1a4649
+install -m 0644 common/__init__.py $RPM_BUILD_ROOT%{python3rhnroot}/common/__init__.py
1a4649
+install -m 0644 common/usix.py* $RPM_BUILD_ROOT%{python3rhnroot}/common/usix.py
1a4649
+
1a4649
 
1a4649
 %clean
1a4649
 
1a4649
 %files
1a4649
 
1a4649
-%files -n python2-%{name}
1a4649
-%dir %{pythonrhnroot}
1a4649
-%dir %{pythonrhnroot}/common
1a4649
-%{pythonrhnroot}/__init__.py
1a4649
-%{pythonrhnroot}/common/__init__.py
1a4649
-%{pythonrhnroot}/common/usix.py*
1a4649
-%exclude %{pythonrhnroot}/__init__.pyc
1a4649
-%exclude %{pythonrhnroot}/__init__.pyo
1a4649
-%exclude %{pythonrhnroot}/common/__init__.pyc
1a4649
-%exclude %{pythonrhnroot}/common/__init__.pyo
1a4649
-
1a4649
-%if 0%{?build_py3}
1a4649
-
1a4649
 %files -n python3-%{name}
1a4649
 %dir %{python3rhnroot}
1a4649
 %dir %{python3rhnroot}/common
1a4649
@@ -100,9 +69,11 @@ cp $RPM_BUILD_ROOT%{pythonrhnroot}/common/usix.py $RPM_BUILD_ROOT%{python3rhnroo
1a4649
 %{python3rhnroot}/common/__pycache__/*
1a4649
 %exclude %{python3rhnroot}/__pycache__/*
1a4649
 %exclude %{python3rhnroot}/common/__pycache__/__init__.*
1a4649
-%endif
1a4649
 
1a4649
 %changelog
1a4649
+* Mon Apr 16 2018 Tomas Kasparek <tkasparek@redhat.com> 2.8.1-5
1a4649
+- build spacewalk-usix just on python3 (tkasparek@redhat.com)
1a4649
+
1a4649
 * Thu Mar 01 2018 Tomas Kasparek <tkasparek@redhat.com> 2.8.1-4
1a4649
 - empty %%files section is required for a package to build as a metapackage
1a4649
   (tkasparek@redhat.com)