From a056e5af3f87d951adc7fdc182b9e07f97dcce19 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 23 2021 14:37:28 +0000 Subject: import subscription-manager-1.24.50-1.el7_9 --- diff --git a/.gitignore b/.gitignore index 7fc7bef..cee4827 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.24.48.tar.gz -SOURCES/subscription-manager-cockpit-1.24.48.tar.gz +SOURCES/subscription-manager-1.24.50.tar.gz +SOURCES/subscription-manager-cockpit-1.24.50.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index a17f1d5..0a16610 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -b4916dad7b559f66c87f2f086ced51558195eb0f SOURCES/subscription-manager-1.24.48.tar.gz -70c6047befb5f8667c665440b9fa000d426d8865 SOURCES/subscription-manager-cockpit-1.24.48.tar.gz +61abae44db6e23fbdbf3463afd5ba0af18acf10b SOURCES/subscription-manager-1.24.50.tar.gz +109a0032bb4e31b52d54205aab83566e3c9e3669 SOURCES/subscription-manager-cockpit-1.24.50.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/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 163031e..9f8cf3c 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 @@ -64,6 +63,7 @@ %global py_package_prefix python%{python3_pkgversion} %global rhsm_package_name %{py_package_prefix}-subscription-manager-rhsm %else +%global __python %__python2 %global py_package_prefix python %global rhsm_package_name subscription-manager-rhsm %endif @@ -133,7 +133,7 @@ %global subpackages SUBPACKAGES="%{?include_syspurpose:syspurpose}" Name: subscription-manager -Version: 1.24.48 +Version: 1.24.50 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -155,8 +155,6 @@ Source1: %{name}-cockpit-%{version}.tar.gz Source2: subscription-manager-rpmlintrc %endif -Patch999: subscription-manager-1.24.13-centos-remove-redhat.repo.patch - %if 0%{?suse_version} < 1200 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif @@ -528,8 +526,6 @@ Subscription Manager Cockpit UI %prep %setup -q -%patch999 -p1 - %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" \ @@ -576,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 @@ -592,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 @@ -616,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/ @@ -883,7 +888,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 @@ -899,10 +904,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 @@ -912,7 +917,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 @@ -998,9 +1003,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 @@ -1055,7 +1060,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 @@ -1157,6 +1162,14 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Thu Oct 21 2021 Christopher Snyder 1.24.50-1 +- 2010137: Newer versions of the rpm tooling expect __python defined + (csnyder@redhat.com) + +* Wed Oct 20 2021 Christopher Snyder 1.24.49-1 +- 2010137: Fix redundant API calls to Candlepin (hyu@redhat.com) +- [1.24] Added support for marketplace ID on RHEL7. (jhnidek@redhat.com) + * Thu Apr 15 2021 Christopher Snyder 1.24.48-1 - 1886772: check is_consumer_cert_key_valid (csnyder@redhat.com)