commit 741ef0de632e1a343d66287d13ee4838bb409f0e Author: James Antill Date: Mon Aug 8 14:06:37 2022 -0400 Import rpm: 4252c9ceaf149ef5e9277fbf72b11cd8028056ac diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4a53703 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/spacewalk-usix-2.8.1.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..72f58f0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA1 (spacewalk-usix-2.8.1.tar.gz) = 2d2408d2dfaabc316b34ef8f64320876518ee2ed diff --git a/spacewalk-usix-2.8.1-1-to-spacewalk-usix-2.8.1-2-el8.patch b/spacewalk-usix-2.8.1-1-to-spacewalk-usix-2.8.1-2-el8.patch new file mode 100644 index 0000000..cd45192 --- /dev/null +++ b/spacewalk-usix-2.8.1-1-to-spacewalk-usix-2.8.1-2-el8.patch @@ -0,0 +1,23 @@ +diff --git a/spacewalk-usix.spec b/spacewalk-usix.spec +index 77f5ce4..0266659 100644 +--- a/spacewalk-usix.spec ++++ b/spacewalk-usix.spec +@@ -11,7 +11,7 @@ + + Name: spacewalk-usix + Version: 2.8.1 +-Release: 1%{?dist} ++Release: 2%{?dist} + Summary: Spacewalk server and client nano six library + + License: GPLv2 +@@ -86,6 +86,9 @@ cp $RPM_BUILD_ROOT%{pythonrhnroot}/common/usix.py $RPM_BUILD_ROOT%{python3rhnroo + %endif + + %changelog ++* Wed Feb 28 2018 Tomas Kasparek 2.8.1-2 ++- rebuild for rhel8 ++ + * Fri Feb 09 2018 Michael Mraka 2.8.1-1 + - remove install/clean section initial cleanup + - removed Group from specfile diff --git a/spacewalk-usix-2.8.1-2-el8-to-spacewalk-usix-2.8.1-3-el8.patch b/spacewalk-usix-2.8.1-2-el8-to-spacewalk-usix-2.8.1-3-el8.patch new file mode 100644 index 0000000..5bdb829 --- /dev/null +++ b/spacewalk-usix-2.8.1-2-el8-to-spacewalk-usix-2.8.1-3-el8.patch @@ -0,0 +1,93 @@ +diff --git a/spacewalk-usix.spec b/spacewalk-usix.spec +index 0266659..ce9df24 100644 +--- a/spacewalk-usix.spec ++++ b/spacewalk-usix.spec +@@ -2,16 +2,23 @@ + %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + %endif + +-%if 0%{?fedora} >= 23 ++%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8 + %{!?python3_sitelib: %global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} + %global python3rhnroot %{python3_sitelib}/spacewalk + %endif + ++%if 0%{?fedora} || 0%{?rhel} >= 8 ++%global build_py3 1 ++%global default_py3 1 ++%endif ++ ++%define pythonX %{?default_py3: python3}%{!?default_py3: python2} ++ + %global pythonrhnroot %{python_sitelib}/spacewalk + + Name: spacewalk-usix + Version: 2.8.1 +-Release: 2%{?dist} ++Release: 3%{?dist} + Summary: Spacewalk server and client nano six library + + License: GPLv2 +@@ -20,14 +27,22 @@ Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version + BuildArch: noarch + + Provides: spacewalk-backend-usix = %{version}-%{release} ++Requires: %{pythonX}-%{name} = %{version}-%{release} + Obsoletes: spacewalk-backend-usix < 2.8 +-BuildRequires: python-devel + + %description + Library for writing code that runs on Python 2 and 3 + +-%if 0%{?fedora} >= 23 ++%package -n python2-%{name} ++Summary: Spacewalk client micro six library ++Provides: python2-spacewalk-backend-usix = %{version}-%{release} ++Obsoletes: python2-spacewalk-backend-usix < 2.8 ++BuildRequires: python-devel ++ ++%description -n python2-%{name} ++Library for writing code that runs on Python 2 and 3 + ++%if 0%{?build_py3} + %package -n python3-%{name} + Summary: Spacewalk client micro six library + Provides: python3-spacewalk-backend-usix = %{version}-%{release} +@@ -52,7 +67,7 @@ install -m 0644 __init__.py $RPM_BUILD_ROOT%{pythonrhnroot}/__init__.py + install -m 0644 common/__init__.py $RPM_BUILD_ROOT%{pythonrhnroot}/common/__init__.py + install -m 0644 common/usix.py* $RPM_BUILD_ROOT%{pythonrhnroot}/common/usix.py + +-%if 0%{?fedora} && 0%{?fedora} >= 23 ++%if 0%{?build_py3} + install -d $RPM_BUILD_ROOT%{python3rhnroot}/common + cp $RPM_BUILD_ROOT%{pythonrhnroot}/__init__.py $RPM_BUILD_ROOT%{python3rhnroot} + cp $RPM_BUILD_ROOT%{pythonrhnroot}/common/__init__.py $RPM_BUILD_ROOT%{python3rhnroot}/common +@@ -61,7 +76,7 @@ cp $RPM_BUILD_ROOT%{pythonrhnroot}/common/usix.py $RPM_BUILD_ROOT%{python3rhnroo + + %clean + +-%files ++%files -n python2-%{name} + %dir %{pythonrhnroot} + %dir %{pythonrhnroot}/common + %{pythonrhnroot}/__init__.py +@@ -72,7 +87,7 @@ cp $RPM_BUILD_ROOT%{pythonrhnroot}/common/usix.py $RPM_BUILD_ROOT%{python3rhnroo + %exclude %{pythonrhnroot}/common/__init__.pyc + %exclude %{pythonrhnroot}/common/__init__.pyo + +-%if 0%{?fedora} && 0%{?fedora} >= 23 ++%if 0%{?build_py3} + + %files -n python3-%{name} + %dir %{python3rhnroot} +@@ -86,6 +101,10 @@ cp $RPM_BUILD_ROOT%{pythonrhnroot}/common/usix.py $RPM_BUILD_ROOT%{python3rhnroo + %endif + + %changelog ++* Wed Feb 28 2018 Tomas Kasparek 2.8.1-3 ++- split spacewalk-usix into python2 and python3 variants (tkasparek@redhat.com) ++- build python3-spacewalk-usix also on rhel8 (tkasparek@redhat.com) ++ + * Wed Feb 28 2018 Tomas Kasparek 2.8.1-2 + - rebuild for rhel8 + diff --git a/spacewalk-usix-2.8.1-3-el8-to-spacewalk-usix-2.8.1-4-el8.patch b/spacewalk-usix-2.8.1-3-el8-to-spacewalk-usix-2.8.1-4-el8.patch new file mode 100644 index 0000000..2afee5b --- /dev/null +++ b/spacewalk-usix-2.8.1-3-el8-to-spacewalk-usix-2.8.1-4-el8.patch @@ -0,0 +1,33 @@ +diff --git a/spacewalk-usix.spec b/spacewalk-usix.spec +index ce9df24..2bf8720 100644 +--- a/spacewalk-usix.spec ++++ b/spacewalk-usix.spec +@@ -18,7 +18,7 @@ + + Name: spacewalk-usix + Version: 2.8.1 +-Release: 3%{?dist} ++Release: 4%{?dist} + Summary: Spacewalk server and client nano six library + + License: GPLv2 +@@ -76,6 +76,8 @@ cp $RPM_BUILD_ROOT%{pythonrhnroot}/common/usix.py $RPM_BUILD_ROOT%{python3rhnroo + + %clean + ++%files ++ + %files -n python2-%{name} + %dir %{pythonrhnroot} + %dir %{pythonrhnroot}/common +@@ -101,6 +103,10 @@ cp $RPM_BUILD_ROOT%{pythonrhnroot}/common/usix.py $RPM_BUILD_ROOT%{python3rhnroo + %endif + + %changelog ++* Thu Mar 01 2018 Tomas Kasparek 2.8.1-4 ++- empty %%files section is required for a package to build as a metapackage ++ (tkasparek@redhat.com) ++ + * Wed Feb 28 2018 Tomas Kasparek 2.8.1-3 + - split spacewalk-usix into python2 and python3 variants (tkasparek@redhat.com) + - build python3-spacewalk-usix also on rhel8 (tkasparek@redhat.com) diff --git a/spacewalk-usix-2.8.1-4-el8-to-spacewalk-usix-2.8.1-5-el8.patch b/spacewalk-usix-2.8.1-4-el8-to-spacewalk-usix-2.8.1-5-el8.patch new file mode 100644 index 0000000..36a7371 --- /dev/null +++ b/spacewalk-usix-2.8.1-4-el8-to-spacewalk-usix-2.8.1-5-el8.patch @@ -0,0 +1,93 @@ +diff --git a/spacewalk-usix.spec b/spacewalk-usix.spec +index 2bf8720..1b550d5 100644 +--- a/spacewalk-usix.spec ++++ b/spacewalk-usix.spec +@@ -18,7 +18,7 @@ + + Name: spacewalk-usix + Version: 2.8.1 +-Release: 4%{?dist} ++Release: 5%{?dist} + Summary: Spacewalk server and client nano six library + + License: GPLv2 +@@ -33,16 +33,6 @@ Obsoletes: spacewalk-backend-usix < 2.8 + %description + Library for writing code that runs on Python 2 and 3 + +-%package -n python2-%{name} +-Summary: Spacewalk client micro six library +-Provides: python2-spacewalk-backend-usix = %{version}-%{release} +-Obsoletes: python2-spacewalk-backend-usix < 2.8 +-BuildRequires: python-devel +- +-%description -n python2-%{name} +-Library for writing code that runs on Python 2 and 3 +- +-%if 0%{?build_py3} + %package -n python3-%{name} + Summary: Spacewalk client micro six library + Provides: python3-spacewalk-backend-usix = %{version}-%{release} +@@ -52,8 +42,6 @@ BuildRequires: python3-devel + %description -n python3-%{name} + Library for writing code that runs on Python 2 and 3 + +-%endif +- + %prep + %setup -q + +@@ -62,35 +50,16 @@ Library for writing code that runs on Python 2 and 3 + %define debug_package %{nil} + + %install +-install -m 0755 -d $RPM_BUILD_ROOT%{pythonrhnroot}/common +-install -m 0644 __init__.py $RPM_BUILD_ROOT%{pythonrhnroot}/__init__.py +-install -m 0644 common/__init__.py $RPM_BUILD_ROOT%{pythonrhnroot}/common/__init__.py +-install -m 0644 common/usix.py* $RPM_BUILD_ROOT%{pythonrhnroot}/common/usix.py +- +-%if 0%{?build_py3} +-install -d $RPM_BUILD_ROOT%{python3rhnroot}/common +-cp $RPM_BUILD_ROOT%{pythonrhnroot}/__init__.py $RPM_BUILD_ROOT%{python3rhnroot} +-cp $RPM_BUILD_ROOT%{pythonrhnroot}/common/__init__.py $RPM_BUILD_ROOT%{python3rhnroot}/common +-cp $RPM_BUILD_ROOT%{pythonrhnroot}/common/usix.py $RPM_BUILD_ROOT%{python3rhnroot}/common +-%endif ++install -m 0755 -d $RPM_BUILD_ROOT%{python3rhnroot}/common ++install -m 0644 __init__.py $RPM_BUILD_ROOT%{python3rhnroot}/__init__.py ++install -m 0644 common/__init__.py $RPM_BUILD_ROOT%{python3rhnroot}/common/__init__.py ++install -m 0644 common/usix.py* $RPM_BUILD_ROOT%{python3rhnroot}/common/usix.py ++ + + %clean + + %files + +-%files -n python2-%{name} +-%dir %{pythonrhnroot} +-%dir %{pythonrhnroot}/common +-%{pythonrhnroot}/__init__.py +-%{pythonrhnroot}/common/__init__.py +-%{pythonrhnroot}/common/usix.py* +-%exclude %{pythonrhnroot}/__init__.pyc +-%exclude %{pythonrhnroot}/__init__.pyo +-%exclude %{pythonrhnroot}/common/__init__.pyc +-%exclude %{pythonrhnroot}/common/__init__.pyo +- +-%if 0%{?build_py3} +- + %files -n python3-%{name} + %dir %{python3rhnroot} + %dir %{python3rhnroot}/common +@@ -100,9 +69,11 @@ cp $RPM_BUILD_ROOT%{pythonrhnroot}/common/usix.py $RPM_BUILD_ROOT%{python3rhnroo + %{python3rhnroot}/common/__pycache__/* + %exclude %{python3rhnroot}/__pycache__/* + %exclude %{python3rhnroot}/common/__pycache__/__init__.* +-%endif + + %changelog ++* Mon Apr 16 2018 Tomas Kasparek 2.8.1-5 ++- build spacewalk-usix just on python3 (tkasparek@redhat.com) ++ + * Thu Mar 01 2018 Tomas Kasparek 2.8.1-4 + - empty %%files section is required for a package to build as a metapackage + (tkasparek@redhat.com) diff --git a/spacewalk-usix.spec b/spacewalk-usix.spec new file mode 100644 index 0000000..18d0820 --- /dev/null +++ b/spacewalk-usix.spec @@ -0,0 +1,128 @@ +%if 0%{?rhel} && 0%{?rhel} < 6 +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%endif + +%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8 +%{!?python3_sitelib: %global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%global python3rhnroot %{python3_sitelib}/spacewalk +%endif + +%if 0%{?fedora} || 0%{?rhel} >= 8 +%global build_py3 1 +%global default_py3 1 +%endif + +%define pythonX %{?default_py3: python3}%{!?default_py3: python2} + +%global pythonrhnroot %{python_sitelib}/spacewalk + +Name: spacewalk-usix +Version: 2.8.1 +Release: 5%{?dist} +Summary: Spacewalk server and client nano six library + +License: GPLv2 +URL: https://github.com/spacewalkproject/spacewalk +Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz +Patch0: spacewalk-usix-2.8.1-1-to-spacewalk-usix-2.8.1-2-el8.patch +Patch1: spacewalk-usix-2.8.1-2-el8-to-spacewalk-usix-2.8.1-3-el8.patch +Patch2: spacewalk-usix-2.8.1-3-el8-to-spacewalk-usix-2.8.1-4-el8.patch +Patch3: spacewalk-usix-2.8.1-4-el8-to-spacewalk-usix-2.8.1-5-el8.patch +BuildArch: noarch + +Provides: spacewalk-backend-usix = %{version}-%{release} +Requires: %{pythonX}-%{name} = %{version}-%{release} +Obsoletes: spacewalk-backend-usix < 2.8 + +%description +Library for writing code that runs on Python 2 and 3 + +%package -n python3-%{name} +Summary: Spacewalk client micro six library +Provides: python3-spacewalk-backend-usix = %{version}-%{release} +Obsoletes: python3-spacewalk-backend-usix < 2.8 +BuildRequires: python3-devel + +%description -n python3-%{name} +Library for writing code that runs on Python 2 and 3 + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + + +%build +%define debug_package %{nil} + +%install +install -m 0755 -d $RPM_BUILD_ROOT%{python3rhnroot}/common +install -m 0644 __init__.py $RPM_BUILD_ROOT%{python3rhnroot}/__init__.py +install -m 0644 common/__init__.py $RPM_BUILD_ROOT%{python3rhnroot}/common/__init__.py +install -m 0644 common/usix.py* $RPM_BUILD_ROOT%{python3rhnroot}/common/usix.py + + +%clean + +%files + +%files -n python3-%{name} +%dir %{python3rhnroot} +%dir %{python3rhnroot}/common +%{python3rhnroot}/__init__.py +%{python3rhnroot}/common/__init__.py +%{python3rhnroot}/common/usix.py* +%{python3rhnroot}/common/__pycache__/* +%exclude %{python3rhnroot}/__pycache__/* +%exclude %{python3rhnroot}/common/__pycache__/__init__.* + +%changelog +* Mon Apr 16 2018 Tomas Kasparek 2.8.1-5 +- build spacewalk-usix just on python3 (tkasparek@redhat.com) + +* Thu Mar 01 2018 Tomas Kasparek 2.8.1-4 +- empty %%files section is required for a package to build as a metapackage + (tkasparek@redhat.com) + +* Wed Feb 28 2018 Tomas Kasparek 2.8.1-3 +- split spacewalk-usix into python2 and python3 variants (tkasparek@redhat.com) +- build python3-spacewalk-usix also on rhel8 (tkasparek@redhat.com) + +* Wed Feb 28 2018 Tomas Kasparek 2.8.1-2 +- rebuild for rhel8 + +* Fri Feb 09 2018 Michael Mraka 2.8.1-1 +- remove install/clean section initial cleanup +- removed Group from specfile +- removed BuildRoot from specfiles + +* Wed Aug 09 2017 Michael Mraka 2.7.8-1 +- 1477753 - precompile py3 bytecode + +* Mon Jul 31 2017 Eric Herget 2.7.7-1 +- update copyright year + +* Mon Jul 17 2017 Jan Dobes 2.7.6-1 +- Updated links to github in spec files +- Migrating Fedorahosted to GitHub + +* Fri Feb 24 2017 Tomas Kasparek 2.7.5-1 +- Revert "do checks to match latest __init__.py from spacewalk-backend-libs" +- don't package pyc and pyo files + +* Thu Feb 23 2017 Tomas Kasparek 2.7.4-1 +- do checks to match latest __init__.py from spacewalk-backend-libs +- don't rely on module initialization on backend-libs + +* Fri Feb 17 2017 Tomas Kasparek 2.7.3-1 +- require python3 version of backend-libs on fedoras + +* Fri Feb 17 2017 Tomas Kasparek 2.7.2-1 +- require spacewalk-backend-libs for usix functionality + +* Wed Feb 15 2017 Tomas Kasparek 2.7.1-1 +- new package built with tito + +