- Bump version to 5.1.0 and clean the spec files with spec-cleaner

- Move to RELEASE_STAGE=beta for setting the proper labels on the containers - Update the rhn_web.conf to web.version = 5.1.0 Alpha1 - Update the rhn_web.conf to web.version.uyuni = 2024.09 - Update INIT_BASE in the Dockerfiles from opensuse/leap:15.5 to opensuse/leap:15.6 - Update BASE in Dockerfiles from bci-base:15.5 to bci-base:15.6 - Add migration paths from 5.0 to 5.1
uyuni-project · Aug 29, 2024 · 996b22c · 996b22c
1 parent a560f41
commit 996b22c
Show file tree

Hide file tree

Showing 170 changed files with 1,097 additions and 1,075 deletions.
diff --git a/branding/spacewalk-branding.changes.releng.bump b/branding/spacewalk-branding.changes.releng.bump
@@ -0,0 +1 @@
+- Bump version to 5.1.0
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
@@ -18,44 +18,41 @@
 
 
 %global debug_package %{nil}
-
 %global susemanager_shared_path  %{_datadir}/susemanager
 %global wwwroot %{susemanager_shared_path}/www
 %global tomcat_path %{wwwroot}/tomcat
 %global wwwdocroot %{wwwroot}/htdocs
-
 Name:           spacewalk-branding
-Version:        5.0.2
+Version:        5.1.0
 Release:        0
 Summary:        Spacewalk branding data
 License:        GPL-2.0-only AND OFL-1.1
+# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
 Group:          Applications/Internet
-
 URL:            https://github.com/uyuni-project/uyuni
 Source0:        https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-#BuildArch:  noarch
-%if 0%{?suse_version}
-BuildRequires:  apache2
-%endif
 BuildRequires:  java-devel >= 11
-
 Requires:       httpd
-Requires(pre):  tomcat
 Requires:       susemanager-advanced-topics_en-pdf
 Requires:       susemanager-best-practices_en-pdf
 Requires:       susemanager-docs_en
+Requires:       susemanager-frontend-libs
 Requires:       susemanager-getting-started_en-pdf
 Requires:       susemanager-reference_en-pdf
-Requires:       susemanager-frontend-libs
+Requires(pre):  tomcat
+#BuildArch:  noarch
+%if 0%{?suse_version}
+BuildRequires:  apache2
+%endif
 
 %description
 Spacewalk specific branding, CSS, and images.
 
 %package devel
-Requires:       %{name} = %{version}-%{release}
 Summary:        Spacewalk LESS source files for development use
+# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
 Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 This package contains LESS source files corresponding to Spacewalk's
@@ -93,7 +90,7 @@ ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{tomcat_path}/webapps/r
 %attr(775,tomcat,tomcat) %dir %{tomcat_path}/webapps/rhn
 %attr(775,tomcat,tomcat) %dir %{tomcat_path}/webapps/rhn/WEB-INF
 %attr(775,tomcat,tomcat) %dir %{tomcat_path}/webapps/rhn/WEB-INF/lib/
-%dir %{_prefix}/share/rhn
-%dir %{_prefix}/share/rhn/lib
+%dir %{_datadir}/rhn
+%dir %{_datadir}/rhn/lib
 
 %changelog
diff --git a/client/rhel/spacewalk-client-tools/spacewalk-client-tools.changes.releng.bump b/client/rhel/spacewalk-client-tools/spacewalk-client-tools.changes.releng.bump
@@ -0,0 +1 @@
+- Bump version to 5.1.0
diff --git a/client/rhel/spacewalk-client-tools/spacewalk-client-tools.spec b/client/rhel/spacewalk-client-tools/spacewalk-client-tools.spec
@@ -33,9 +33,9 @@
 %global _buildshell /bin/bash
 %endif
 
-%{!?__python2:%global __python2 /usr/bin/python2}
-%{!?__python3:%global __python3 /usr/bin/python3}
 
+%{!?__python2:%global __python2 %{_bindir}/python2}
+%{!?__python3:%global __python3 %{_bindir}/python3}
 %if %{undefined python2_version}
 %global python2_version %(%{__python2} -Esc "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))")
 %endif
@@ -65,20 +65,20 @@
 %bcond_with    test
 
 Name:           spacewalk-client-tools
+Version:        5.1.0
+Release:        0
 Summary:        Support programs and libraries for Spacewalk
 License:        GPL-2.0-only
+URL:            https://github.com/uyuni-project/uyuni
+Source0:        %{name}-%{version}.tar.gz
+Source1:        https://raw.githubusercontent.com/uyuni-project/uyuni/%{name}-%{version}-0/client/rhel/%{name}/%{name}-rpmlintrc
 %if "%{_vendor}" == "debbuild"
 Packager:       Uyuni Project <devel@lists.uyuni-project.org>
 Group:          admin
 %else
+# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
 Group:          System Environment/Base
 %endif
-Version:        5.0.7
-Source0:        %{name}-%{version}.tar.gz
-Source1:        https://raw.githubusercontent.com/uyuni-project/uyuni/%{name}-%{version}-0/client/rhel/%{name}/%{name}-rpmlintrc
-URL:            https://github.com/uyuni-project/uyuni
-Release:        0
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} >= 1210 || 0%{?mageia} >= 6
 BuildArch:      noarch
 %endif
@@ -159,6 +159,7 @@ Summary:        Support programs and libraries for Spacewalk
 %if "%{_vendor}" == "debbuild"
 Group:          python
 %else
+# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
 Group:          System Environment/Base
 %endif
 Provides:       python-%{name} = %{version}-%{release}
@@ -209,19 +210,19 @@ BuildRequires:  rpm-python
 %endif # if {_vendor} != "debbuild"
 
 %if "%{_vendor}" == "debbuild"
-Requires:       python-dmidecode
-Requires:       python-ethtool >= 0.4
-Requires:       python-rpm
-BuildRequires:  python-dev
-Requires:       python2-hwdata
 BuildRequires:  python-coverage
+BuildRequires:  python-dev
 BuildRequires:  python-rpm
 Requires:       gir1.2-gudev-1.0
 Requires:       python-dbus
+Requires:       python-dmidecode
+Requires:       python-ethtool >= 0.4
 Requires:       python-gi
 Requires:       python-pyudev
-Requires(preun):python-minimal
+Requires:       python-rpm
+Requires:       python2-hwdata
 Requires(post): python-minimal
+Requires(preun): python-minimal
 %endif
 
 %description -n python2-%{name}
@@ -234,6 +235,7 @@ Summary:        Support programs and libraries for Spacewalk
 %if "%{_vendor}" == "debbuild"
 Group:          python
 %else
+# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
 Group:          System Environment/Base
 %endif
 Provides:       python3-rhn-client-tools = %{version}-%{release}
@@ -272,8 +274,8 @@ Requires:       gir1.2-gudev-1.0
 Requires:       python3-dbus
 Requires:       python3-gi
 Requires:       python3-pyudev
-Requires(preun):python3-minimal
 Requires(post): python3-minimal
+Requires(preun): python3-minimal
 %endif
 
 %if %{with test} && 0%{?rhel} != 6
@@ -296,25 +298,25 @@ make -f Makefile.rhn-client-tools %{?is_deb:PLATFORM=deb}
 %if 0%{?build_py2}
 make -f Makefile.rhn-client-tools install VERSION=%{version}-%{release} \
         PYTHONPATH=%{python_sitelib} PYTHONVERSION=%{python_version} \
-        PREFIX=$RPM_BUILD_ROOT %{?is_deb:PLATFORM=deb}
+        PREFIX=%{buildroot} %{?is_deb:PLATFORM=deb}
 %endif
 %if 0%{?build_py3}
-sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|' test/*.py
+sed -i 's|#!%{_bindir}/python|#!%{_bindir}/python3|' test/*.py
 make -f Makefile.rhn-client-tools %{?is_deb:PLATFORM=deb}
 make -f Makefile.rhn-client-tools install VERSION=%{version}-%{release} \
         PYTHONPATH=%{python3_sitelib} PYTHONVERSION=%{python3_version} \
-        PREFIX=$RPM_BUILD_ROOT %{?is_deb:PLATFORM=deb}
+        PREFIX=%{buildroot} %{?is_deb:PLATFORM=deb}
 %endif
 
-mkdir -p $RPM_BUILD_ROOT/var/lib/up2date
-mkdir -pm700 $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date
-touch $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date/loginAuth.pkl
+mkdir -p %{buildroot}%{_localstatedir}/lib/up2date
+mkdir -pm700 %{buildroot}%{_localstatedir}/spool/up2date
+touch %{buildroot}%{_localstatedir}/spool/up2date/loginAuth.pkl
 %if 0%{?fedora} || 0%{?mageia} || 0%{?debian} >= 8 || 0%{?ubuntu} >= 1504 || 0%{?sle_version} >= 120000 || 0%{?rhel} >= 7
-mkdir -p $RPM_BUILD_ROOT/%{_presetdir}
+mkdir -p %{buildroot}/%{_presetdir}
 %endif
 
 # remove all unsupported translations
-cd $RPM_BUILD_ROOT
+cd %{buildroot}
 for d in usr/share/locale/*; do
   if [ ! -d "/$d" ]; then
     rm -rfv "./$d"
@@ -326,8 +328,8 @@ cd -
 %find_lang rhn-client-tools
 %endif
 
-rm -rf $RPM_BUILD_ROOT/etc/pam.d
-rm -rf $RPM_BUILD_ROOT/etc/security/console.apps
+rm -rf %{buildroot}%{_sysconfdir}/pam.d
+rm -rf %{buildroot}%{_sysconfdir}/security/console.apps
 
 %if 0%{?suse_version}
 %if 0%{?build_py2}
@@ -351,9 +353,8 @@ make -f Makefile.rhn-client-tools test
 %files
 # No find_lang on Debian systems
 %{_datadir}/locale/
-/var/lib/up2date/
+%{_localstatedir}/lib/up2date/
 %else
-
 %files -f rhn-client-tools.lang
 %endif
 %defattr(-,root,root,-)
@@ -422,7 +423,6 @@ pycompile -p python2-%{name} -V -3.0
 %preun -n python2-%{name}
 # Ensure all *.py[co] files are deleted, per debian policy
 pyclean -p python2-%{name}
-
 %endif
 
 %if 0%{?build_py3}
@@ -433,7 +433,6 @@ py3compile -p python3-%{name} -V -4.0
 %preun -n python3-%{name}
 # Ensure all *.py[co] files are deleted, per debian policy
 py3clean -p python3-%{name}
-
 %endif
 %endif
 

diff --git a/client/tools/mgr-push/mgr-push.changes.releng.bump b/client/tools/mgr-push/mgr-push.changes.releng.bump
@@ -0,0 +1 @@
+- Bump version to 5.1.0
diff --git a/client/tools/mgr-push/mgr-push.spec b/client/tools/mgr-push/mgr-push.spec
@@ -20,7 +20,7 @@
 # Old name and version+1 before renaming to mgr-push
 %define oldname rhnpush
 %define oldversion 5.5.114
-%global __python /usr/bin/python2
+%global __python %{_bindir}/python2
 
 %if 0%{?fedora} || 0%{?suse_version} > 1320 || 0%{?rhel} >= 8
 %global build_py3   1
@@ -32,26 +32,25 @@
 %endif
 
 %define pythonX %{?default_py3: python3}%{!?default_py3: python2}
-
 Name:           mgr-push
+Version:        5.1.0
+Release:        0
 Summary:        Package uploader for the Spacewalk
 License:        GPL-2.0-only
+# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
 Group:          Applications/System
 URL:            https://github.com/uyuni-project/uyuni
-Version:        5.0.2
-Release:        0
-Provides:       %{oldname} = %{oldversion}
-Obsoletes:      %{oldname} < %{oldversion}
 Source0:        https://github.com/uyuni-project/uyuni/archive/%{name}-%{version}-0.tar.gz
 Source1:        https://raw.githubusercontent.com/uyuni-project/uyuni/%{name}-%{version}-0/client/tools/mgr-push/%{name}-rpmlintrc
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} >= 1210
-BuildArch:      noarch
-%endif
-Requires:       %{pythonX}-%{name} = %{version}-%{release}
 BuildRequires:  docbook-utils
 BuildRequires:  gettext
 BuildRequires:  make
+Requires:       %{pythonX}-%{name} = %{version}-%{release}
+Provides:       %{oldname} = %{oldversion}
+Obsoletes:      %{oldname} < %{oldversion}
+%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} >= 1210
+BuildArch:      noarch
+%endif
 
 %description
 rhnpush uploads package headers to the Spacewalk
@@ -62,22 +61,23 @@ per channel.
 %if 0%{?build_py2}
 %package -n python2-%{name}
 Summary:        Package uploader for the Spacewalk or Red Hat Satellite Server
+# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
 Group:          Applications/System
+BuildRequires:  python2-rhn-client-tools
+BuildRequires:  python2-uyuni-common-libs
+Requires:       %{name} = %{version}-%{release}
+Requires:       python2-rhn-client-tools
+Requires:       python2-uyuni-common-libs
+Requires:       rhnlib >= 2.8.3
 Provides:       python2-%{oldname} = %{oldversion}
 Obsoletes:      python2-%{oldname} < %{oldversion}
-Requires:       %{name} = %{version}-%{release}
 %if 0%{?fedora} >= 28
-Requires:       python2-rpm
 BuildRequires:  python2-devel
+Requires:       python2-rpm
 %else
-Requires:       rpm-python
 BuildRequires:  python-devel
+Requires:       rpm-python
 %endif
-Requires:       python2-rhn-client-tools
-Requires:       python2-uyuni-common-libs
-Requires:       rhnlib >= 2.8.3
-BuildRequires:  python2-rhn-client-tools
-BuildRequires:  python2-uyuni-common-libs
 
 %description -n python2-%{name}
 Python 2 specific files for rhnpush.
@@ -86,22 +86,23 @@ Python 2 specific files for rhnpush.
 %if 0%{?build_py3}
 %package -n python3-%{name}
 Summary:        Package uploader for the Spacewalk or Red Hat Satellite Server
+# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
 Group:          Applications/System
+BuildRequires:  python3-devel
+BuildRequires:  python3-rhn-client-tools
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-uyuni-common-libs
+Requires:       %{name} = %{version}-%{release}
+Requires:       python3-rhn-client-tools
+Requires:       python3-rhnlib >= 2.8.3
+Requires:       python3-uyuni-common-libs
 Provides:       python3-%{oldname} = %{oldversion}
 Obsoletes:      python3-%{oldname} < %{oldversion}
-Requires:       %{name} = %{version}-%{release}
 %if 0%{?suse_version}
 Requires:       python3-rpm
 %else
 Requires:       rpm-python3
 %endif
-Requires:       python3-rhn-client-tools
-Requires:       python3-rhnlib >= 2.8.3
-Requires:       python3-uyuni-common-libs
-BuildRequires:  python3-devel
-BuildRequires:  python3-rhn-client-tools
-BuildRequires:  python3-rpm-macros
-BuildRequires:  python3-uyuni-common-libs
 
 %description -n python3-%{name}
 Python 3 specific files for rhnpush.
@@ -114,23 +115,23 @@ Python 3 specific files for rhnpush.
 make -f Makefile.rhnpush all
 
 %install
-install -d $RPM_BUILD_ROOT/%{python_sitelib}
+install -d %{buildroot}/%{python_sitelib}
 %if 0%{?build_py2}
-make -f Makefile.rhnpush install PREFIX=$RPM_BUILD_ROOT ROOT=%{python_sitelib} \
+make -f Makefile.rhnpush install PREFIX=%{buildroot} ROOT=%{python_sitelib} \
     MANDIR=%{_mandir} PYTHON_VERSION=%{python_version}
 %endif
 
 %if 0%{?build_py3}
 sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|' rhnpush
-install -d $RPM_BUILD_ROOT/%{python3_sitelib}
-make -f Makefile.rhnpush install PREFIX=$RPM_BUILD_ROOT ROOT=%{python3_sitelib} \
+install -d %{buildroot}/%{python3_sitelib}
+make -f Makefile.rhnpush install PREFIX=%{buildroot} ROOT=%{python3_sitelib} \
     MANDIR=%{_mandir} PYTHON_VERSION=%{python3_version}
 %endif
 
 %define default_suffix %{?default_py3:-%{python3_version}}%{!?default_py3:-%{python_version}}
-ln -s rhnpush%{default_suffix} $RPM_BUILD_ROOT%{_bindir}/rhnpush
+ln -s rhnpush%{default_suffix} %{buildroot}%{_bindir}/rhnpush
 %if 0%{?suse_version}
-ln -s rhnpush $RPM_BUILD_ROOT/%{_bindir}/mgrpush
+ln -s rhnpush %{buildroot}/%{_bindir}/mgrpush
 %endif
 
 %files
@@ -142,8 +143,8 @@ ln -s rhnpush $RPM_BUILD_ROOT/%{_bindir}/mgrpush
 %{_bindir}/mgrpush
 %endif
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/rhn/rhnpushrc
-%{_mandir}/man8/rhnpush.8*
-%doc COPYING
+%{_mandir}/man8/rhnpush.8%{?ext_man}
+%license COPYING
 
 %if 0%{?build_py2}
 %files -n python2-%{name}