diff --git a/.gitignore b/.gitignore index b0ef527..9545972 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.24.52.tar.gz -SOURCES/subscription-manager-cockpit-1.24.52.tar.gz +SOURCES/subscription-manager-1.24.53.tar.gz +SOURCES/subscription-manager-cockpit-1.24.53.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index 14607b7..43e2601 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -965dd47ec45ea3ff89d7331ed9f2b2e5f0eab309 SOURCES/subscription-manager-1.24.52.tar.gz -fd8a92725095ec38e87c04c7a9fe316b09d29a38 SOURCES/subscription-manager-cockpit-1.24.52.tar.gz +494792077d01796d56d7f981353eae0863c8f804 SOURCES/subscription-manager-1.24.53.tar.gz +c4abb06ab71f2677ca9a1513f101a577790f3782 SOURCES/subscription-manager-cockpit-1.24.53.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/SOURCES/00001-fix-dbus-policy.patch b/SOURCES/00001-fix-dbus-policy.patch deleted file mode 100644 index ee8bc45..0000000 --- a/SOURCES/00001-fix-dbus-policy.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/etc-conf/dbus/system.d/com.redhat.RHSM1.conf b/etc-conf/dbus/system.d/com.redhat.RHSM1.conf -index e21c57263..11adf1d79 100644 ---- a/etc-conf/dbus/system.d/com.redhat.RHSM1.conf -+++ b/etc-conf/dbus/system.d/com.redhat.RHSM1.conf -@@ -7,23 +7,9 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -+ - - -@@ -37,11 +23,6 @@ - - -- -- -- - - -@@ -65,5 +46,54 @@ - - -- - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ diff --git a/SOURCES/subscription-manager-1.24.13-centos-remove-redhat.repo.patch b/SOURCES/subscription-manager-1.24.13-centos-remove-redhat.repo.patch deleted file mode 100644 index b8bcb38..0000000 --- a/SOURCES/subscription-manager-1.24.13-centos-remove-redhat.repo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNrp subscription-manager-1.24.13.orig/src/subscription_manager/repofile.py subscription-manager-1.24.13/src/subscription_manager/repofile.py ---- subscription-manager-1.24.13.orig/src/subscription_manager/repofile.py 2019-06-21 18:36:40.000000000 +0000 -+++ subscription-manager-1.24.13/src/subscription_manager/repofile.py 2019-08-07 15:55:54.331501447 +0000 -@@ -345,6 +345,7 @@ class RepoFileBase(object): - return self.path_exists(self.path) - - def create(self): -+ return - if self.path_exists(self.path) or not self.manage_repos: - return - with open(self.path, 'w') as f: diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index 5f883eb..90c78c0 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,8 +133,8 @@ %global subpackages SUBPACKAGES="%{?include_syspurpose:syspurpose}" Name: subscription-manager -Version: 1.24.52 -Release: 2%{?dist} +Version: 1.24.53 +Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base License: GPLv2 @@ -266,9 +265,6 @@ BuildRequires: systemd-rpm-macros BuildRequires: systemd %endif -Patch00001: 00001-fix-dbus-policy.patch -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 @@ -530,8 +526,6 @@ Subscription Manager Cockpit UI %prep %setup -q -%autopatch -p1 - %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" \ @@ -578,6 +572,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 @@ -594,21 +610,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 @@ -618,11 +626,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/ @@ -893,7 +896,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 @@ -909,10 +912,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 @@ -922,7 +925,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 @@ -1008,9 +1011,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 @@ -1065,7 +1068,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 @@ -1167,8 +1170,12 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog -* Tue Aug 08 2023 Jiri Hnidek 1.24.52-2 -- 2229752: Fix D-Bus policy (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) +- Collect Azure Subscription ID as a cloud fact (#3285) (chambrid@redhat.com) +- Stop requiring M2crypto (ptoscano@redhat.com) +- tests: make M2Crypto optional (ptoscano@redhat.com) * Tue Jun 27 2023 Pino Toscano 1.24.52-1 - tito: update rhel-7.9 releaser (ptoscano@redhat.com)