diff --git a/.gitignore b/.gitignore index ae312ab..26cb909 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.24.13.tar.gz -SOURCES/subscription-manager-cockpit-1.24.13.tar.gz +SOURCES/subscription-manager-1.24.26.tar.gz +SOURCES/subscription-manager-cockpit-1.24.26.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index 0910cbf..744ebc3 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -253c3a715939742947af0d8821417b8ba525fc1f SOURCES/subscription-manager-1.24.13.tar.gz -d01dc41c52bc69692b05ecf9714927535c8a788a SOURCES/subscription-manager-cockpit-1.24.13.tar.gz +89e5fa47d8ce6ddb9ea9cb54be8322c935249847 SOURCES/subscription-manager-1.24.26.tar.gz +7a34e0a5ff3b30edc48c583b699c201d102d0b39 SOURCES/subscription-manager-cockpit-1.24.26.tar.gz 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 a549f4b..e62681f 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 @@ -133,8 +132,8 @@ %global subpackages SUBPACKAGES="%{?include_syspurpose:syspurpose}" Name: subscription-manager -Version: 1.24.13 -Release: 4%{?dist} +Version: 1.24.26 +Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base License: GPLv2 @@ -155,8 +154,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 +525,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 +571,24 @@ 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} +sed -i 's/libexec/lib/g' %{buildroot}/%{_sysconfdir}/cron.daily/rhsmd +%endif + %find_lang rhsm %if 0%{?include_syspurpose} %find_lang syspurpose @@ -592,21 +605,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 +621,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/ @@ -878,7 +878,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 @@ -894,9 +894,9 @@ 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 @@ -906,7 +906,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 @@ -992,9 +992,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 @@ -1049,7 +1049,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 @@ -1150,15 +1150,79 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog -* Mon Mar 02 2020 Christopher Snyder 1.24.13-4 -- 1809221: Yum loaded subscription-manager plugin multiple times +* Wed Jan 22 2020 William Poteat 1.24.26-1 +- 1741183: Yum loaded subscription-manager plugin multiple times (hyu@redhat.com) -* Tue Aug 20 2019 Christopher Snyder 1.24.13-3 -- 1743860: Update dnf-plugin dependencies for RHEL 7 (csnyder@redhat.com) +* Wed Jan 08 2020 Christopher Snyder 1.24.25-1 +- 1786236: Update repos quickly enough to allow yum install -y $package + immediately in containers (csnyder@redhat.com) +- 1788293: Update repos in postconfig_hook to see new repos immediately + (csnyder@redhat.com) +- 1788297: Duplicate messages are being reported by the yum plugin for + subscription-manager (wpoteat@redhat.com) + +* Mon Jan 06 2020 William Poteat 1.24.24-1 +- 1733992: Update to translations (wpoteat@redhat.com) + +* Thu Oct 17 2019 Christopher Snyder 1.24.23-1 +- 1703054: Blacklist some locales for Python2.x; ENT-1288 (jhnidek@redhat.com) + +* Tue Oct 08 2019 Christopher Snyder 1.24.22-1 +- 1756491: Remove usage of deprecated method in yum plugins + (csnyder@redhat.com) + +* Thu Sep 19 2019 Christopher Snyder 1.24.21-1 +- 1724712: Updated from System Type to Entitlement Type (waldirio@gmail.com) + +* Wed Sep 18 2019 Christopher Snyder 1.24.20-1 +- 1520383: Update to logging levels (wpoteat@redhat.com) + +* Fri Sep 13 2019 Christopher Snyder 1.24.19-1 +- 1752059: corrected cron receving stdout mail for rhsmd run (crag@redhat.com) +- 1733992: Update translations (csnyder@redhat.com) + +* Tue Sep 03 2019 Christopher Snyder 1.24.18-1 +- 1621275: YUM plugin - less API calls; ENT-923 (jhnidek@redhat.com) + +* Tue Sep 03 2019 Christopher Snyder 1.24.17-1 +- 1643189: Added timeout for rhsmd cron job (crag@redhat.com) + +* Tue Aug 20 2019 Christopher Snyder 1.24.16-1 +- 1743729: Update dnf-plugin dependencies for RHEL 7 (csnyder@redhat.com) -* Mon Aug 19 2019 Christopher Snyder 1.24.13-2 -- 1743120: Send package profile on yum transactions (csnyder@redhat.com) +* Fri Aug 16 2019 Christopher Snyder 1.24.15-1 +- 1742208: Send package profile on yum transactions (csnyder@redhat.com) + +* Tue Aug 13 2019 Christopher Snyder 1.24.14-1 +- 1739706: Proper messaging of syspurpose add-addons + (jhnidek@redhat.com) +- 1739707: GUI: Do not auto-attach, when golden ticket is used + (jhnidek@redhat.com) +- 1705017: Show in man page that --installed is the default for the list + command (wpoteat@redhat.com) +- 1737894: syspurpose attributes in list --consumed + (jhnidek@redhat.com) +- 1737894: Print roles and usage in list of subscriptions + (jhnidek@redhat.com) +- 1739705: Don't print traceback during list --available + (jhnidek@redhat.com) +- 1724712: Updating from System Type to Entitlement Type (waldirio@gmail.com) +- 1739699: Fixed unsetting syspurpose attributes (jhnidek@redhat.com) +- 1723803: Print reasons, why syspurpose status is mismatch + (jhnidek@redhat.com) +- 1652549: Addition of tests for heartbeat method (wpoteat@redhat.com) +- 1652549: Connection method for hypervisor heartbeat (wpoteat@redhat.com) +- 1739695: Add in a last_boot fact for parity with spacewalk facts + (bryan.kearney@gmail.com) +- 1702239: Fix traceback for syspurpose on rhel7 (jhnidek@redhat.com) +- 1703054: Do not crash sub-man during unregistering + (jhnidek@redhat.com) +- 1739697: Syspurpose client to have the same behavior as SubMan when in + conflict with server (wpoteat@redhat.com) +- 1591315: Fewer warning messages when golden ticket is used + (jhnidek@redhat.com) +- 1520383: Use more appropriate log levels instead of info (wpoteat@redhat.com) * Fri Jun 21 2019 Christopher Snyder 1.24.13-1 - 1722238: Fix reporting insights id in facts on RHEL7 (jhnidek@redhat.com)