From ae4e53fc45c02b126b25c17345cda3468853d484 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 19 2024 01:00:25 +0000 Subject: import subscription-manager-1.24.54-1.el7_9 --- diff --git a/.gitignore b/.gitignore index 9545972..3397318 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.24.53.tar.gz -SOURCES/subscription-manager-cockpit-1.24.53.tar.gz +SOURCES/subscription-manager-1.24.54.tar.gz +SOURCES/subscription-manager-cockpit-1.24.54.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index 43e2601..016c859 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -494792077d01796d56d7f981353eae0863c8f804 SOURCES/subscription-manager-1.24.53.tar.gz -c4abb06ab71f2677ca9a1513f101a577790f3782 SOURCES/subscription-manager-cockpit-1.24.53.tar.gz +da271658b78c0d749a43577919dc8a7e7d0103a4 SOURCES/subscription-manager-1.24.54.tar.gz +e6abcd81fa62579f36f7650a96383f5545178082 SOURCES/subscription-manager-cockpit-1.24.54.tar.gz diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index 2c42911..3ea4ae6 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -2,7 +2,6 @@ %global use_systemd 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 7) || (0%{?suse_version} && 0%{?suse_version} >= 1315) # For optional building of ostree-plugin sub package. Unrelated to systemd # but the same versions apply at the moment. -%global if_centos (0%{?centos_ver} && 0%{?centos_ver} >= 7) %global has_ostree %use_systemd && 0%{?suse_version} == 0 %global use_initial_setup 1 %global use_firstboot 0 @@ -134,7 +133,7 @@ %global subpackages SUBPACKAGES="%{?include_syspurpose:syspurpose}" Name: subscription-manager -Version: 1.24.53 +Version: 1.24.54 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -179,7 +178,8 @@ Requires: virt-what Requires: %{rhsm_package_name} = %{version} Requires: %{py_package_prefix}-six Requires: %{py_package_prefix}-dateutil -Requires: %{py_package_prefix}-syspurpose +Requires: %{py_package_prefix}-syspurpose +Requires: %{py_package_prefix}-requests # rhel 8 has different naming for setuptools going forward %if (0%{?rhel} && 0%{?rhel} >= 8) @@ -266,8 +266,6 @@ BuildRequires: systemd-rpm-macros BuildRequires: systemd %endif -Patch999: subscription-manager-1.24.13-centos-remove-redhat.repo.patch - %description The Subscription Manager package provides programs and libraries to allow users to manage subscriptions and yum repositories from the Red Hat entitlement @@ -575,6 +573,28 @@ python2 ./setup.py build_ext --build-lib %{buildroot}%{python2_sitearch} --quiet cp %{buildroot}%{python_sitearch}/rhsm/*.py %{buildroot}%{python2_sitearch}/rhsm/ %endif +%if 0%{?suse_version} +%suse_update_desktop_file -n -r subscription-manager-gui Settings PackageManager +%endif + +%if %use_subman_gui +desktop-file-validate %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop +desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-gui.desktop +%else + +%if %use_cockpit +desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-cockpit.desktop +%endif + +%endif + +# libexec directory does not exist on sles based distros +%if 0%{?suse_version} +%if %use_subman_gui + sed -i 's/libexec/lib/g' %{buildroot}/%{_sysconfdir}/cron.daily/rhsmd +%endif +%endif + %find_lang rhsm %if 0%{?include_syspurpose} %find_lang syspurpose @@ -591,21 +611,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/pki/consumer mkdir -p %{buildroot}%{_sysconfdir}/pki/entitlement # Setup cert directories for the container plugin: -%if 0%{!?if_centos} mkdir -p %{buildroot}%{_sysconfdir}/docker/certs.d/ mkdir %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt -%else -rm %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem -%endif -%if 0%{!?if_centos} mkdir -p %{buildroot}%{_sysconfdir}/etc/rhsm/ca install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-uep.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-uep.pem -%else -rm %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem -%endif %if %use_cockpit # install cockpit dist targz @@ -615,11 +627,6 @@ rm %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem # fix timestamps on our byte compiled files so they match across arches find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; -rm -f %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop -rm -f %{buildroot}/usr/bin/rhsm-icon -rm -f %{buildroot}/usr/bin/subscription-manager-gui -rm -f %{buildroot}/usr/sbin/subscription-manager-gui - %if %{with python3} %py_byte_compile %{__python3} %{buildroot}%{rhsm_plugins_dir}/ %py_byte_compile %{__python3} %{buildroot}%{_datadir}/anaconda/addons/com_redhat_subscription_manager/ @@ -890,7 +897,7 @@ rm -f %{buildroot}/usr/sbin/subscription-manager-gui #%files -n subscription-manager-gui -f subscription-manager.lang %files -n subscription-manager-gui %defattr(-,root,root,-) -#%attr(755,root,root) %{_sbindir}/subscription-manager-gui +%attr(755,root,root) %{_sbindir}/subscription-manager-gui %if 0%{?suse_version} %dir %{python_sitearch}/subscription_manager/gui/data %dir %{python_sitearch}/subscription_manager/gui/data/glade @@ -906,10 +913,10 @@ rm -f %{buildroot}/usr/sbin/subscription-manager-gui %dir %{_datadir}/omf/subscription-manager %else # symlink to console-helper -#%{_bindir}/subscription-manager-gui +%{_bindir}/subscription-manager-gui %endif -#%{_bindir}/rhsm-icon +%{_bindir}/rhsm-icon %{_datadir}/gnome/help/subscription-manager/C/figures/*.png %{_datadir}/gnome/help/subscription-manager/C/*.xml @@ -919,7 +926,7 @@ rm -f %{buildroot}/usr/sbin/subscription-manager-gui %{_datadir}/appdata/subscription-manager-gui.appdata.xml # desktop config files -#%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop +%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop %if !0%{?suse_version} %{_sysconfdir}/pam.d/subscription-manager-gui %{_sysconfdir}/security/console.apps/subscription-manager-gui @@ -1005,9 +1012,9 @@ rm -f %{buildroot}/usr/sbin/subscription-manager-gui %{python_sitearch}/subscription_manager/plugin/container.py* # Copying Red Hat CA cert into each directory: -#%attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com -#%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem -#%attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt +%attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com +%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem +%attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt %if %has_ostree @@ -1062,7 +1069,7 @@ rm -f %{buildroot}/usr/sbin/subscription-manager-gui %attr(755,root,root) %dir %{_sysconfdir}/rhsm %attr(755,root,root) %dir %{_sysconfdir}/rhsm/ca -#%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem +%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem %if %use_cockpit %files -n subscription-manager-cockpit @@ -1164,6 +1171,13 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Mon Feb 12 2024 Pino Toscano +- tito: drop bz requirement (ptoscano@redhat.com) +- fix: 1.24 Add python-requests to the list of required RPMs + (jhnidek@redhat.com) +- fix: Pin lxml to last version supporting Python 2 (mhorky@redhat.com) +- fix: Add missing package intltool to test script (jhnidek@redhat.com) + * Fri Sep 22 2023 Pino Toscano 1.24.53-1 - 2229752: [1.24] Hotfix of D-Bus policy (jhnidek@redhat.com) - Collect GCP Project information as cloud facts (chambrid@redhat.com)