diff --git a/.gitignore b/.gitignore index 4919d80..37d1706 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.27.3.tar.gz -SOURCES/subscription-manager-cockpit-1.27.3.tar.gz +SOURCES/subscription-manager-1.27.4.tar.gz +SOURCES/subscription-manager-cockpit-1.27.4.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index 673c6cb..380b284 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -770f06a56549febdc50b89874828976187353f2e SOURCES/subscription-manager-1.27.3.tar.gz -b77fda846d248edfe316382ec83b4d4e854958c4 SOURCES/subscription-manager-cockpit-1.27.3.tar.gz +4687f5b0c05bc1ef8115806e43f30180d51d823e SOURCES/subscription-manager-1.27.4.tar.gz +596b1c985b2f7a1426ab3d7f42d0738cf16258bf SOURCES/subscription-manager-cockpit-1.27.4.tar.gz diff --git a/SOURCES/CENTOS-use-centos-syspurposes.patch b/SOURCES/CENTOS-use-centos-syspurposes.patch deleted file mode 100644 index 52d2e66..0000000 --- a/SOURCES/CENTOS-use-centos-syspurposes.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/etc-conf/syspurpose/valid_fields.json b/etc-conf/syspurpose/valid_fields.json -index 1ac7ea0e..305ec4b9 100644 ---- a/etc-conf/syspurpose/valid_fields.json -+++ b/etc-conf/syspurpose/valid_fields.json -@@ -1,12 +1,10 @@ - { - "role": [ -- "Red Hat Enterprise Linux Server", -- "Red Hat Enterprise Linux Workstation", -- "Red Hat Enterprise Linux Compute Node" -+ "CentOS Linux Server", -+ "CentOS Linux Workstation", -+ "CentOS Linux Compute Node" - ], - "service_level_agreement": [ -- "Premium", -- "Standard", - "Self-Support" - ], - "usage": [ diff --git a/SOURCES/subscription-manager-centos-remove-redhat.repo.patch b/SOURCES/subscription-manager-centos-remove-redhat.repo.patch deleted file mode 100644 index d474938..0000000 --- a/SOURCES/subscription-manager-centos-remove-redhat.repo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNrp subscription-manager-1.23.8.orig/src/subscription_manager/repofile.py subscription-manager-1.23.8/src/subscription_manager/repofile.py ---- subscription-manager-1.23.8.orig/src/subscription_manager/repofile.py 2019-03-06 08:15:21.000000000 -0600 -+++ subscription-manager-1.23.8/src/subscription_manager/repofile.py 2019-07-10 12:03:11.266030982 -0500 -@@ -340,6 +340,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 63d157a..6cb273e 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -222,8 +222,8 @@ %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} Name: subscription-manager -Version: 1.27.3 -Release: 1%{?dist}.0.1 +Version: 1.27.4 +Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} Group: Productivity/Networking/System @@ -253,9 +253,6 @@ Source2: subscription-manager-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif -Patch100: CENTOS-use-centos-syspurposes.patch -Patch101: subscription-manager-centos-remove-redhat.repo.patch - # The following macro examples are preceeded by '%' to stop macro expansion # in the comments. (See https://bugzilla.redhat.com/show_bug.cgi?id=1224660 for # why this is necessary) @@ -561,11 +558,9 @@ Group: System Environment/Base Requires: rhsm-gtk = %{version}-%{release} Requires: initial-setup-gui >= 0.3.9.24-1 Obsoletes: subscription-manager-firstboot < 1.15.3-1 -%if %{undefined centos} %if (0%{?rhel} >= 8) Supplements: initial-setup-gui %endif -%endif %description -n subscription-manager-initial-setup-addon This package contains the initial-setup screens for subscription-manager. @@ -718,8 +713,6 @@ subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugi %prep %setup -q -%patch100 -p1 -%patch101 -p1 %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ @@ -801,9 +794,7 @@ desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-c # fake out the redhat.repo file %if %{use_yum} || %{use_dnf} mkdir %{buildroot}%{_sysconfdir}/yum.repos.d - %if %{undefined centos} touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo - %endif %endif # fake out the certificate directories @@ -813,19 +804,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/pki/entitlement %if %{use_container_plugin} # Setup cert directories for the container plugin: mkdir -p %{buildroot}%{_sysconfdir}/docker/certs.d/ -%if %{undefined centos} 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 %endif -%endif -%if %{undefined 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 %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem -%endif %if %use_cockpit # install cockpit dist targz @@ -851,10 +836,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %endif %endif -%if %{defined centos} -sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscription-manager.conf -%endif - # base/cli tools use the gettext domain 'rhsm', while the # gnome-help tools use domain 'subscription-manager' %files -f rhsm.lang @@ -1231,12 +1212,10 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti %endif %{python_sitearch}/subscription_manager/plugin/container/*.py* -%if %{undefined centos} # 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}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt %endif -%endif %if %has_ostree %files -n subscription-manager-plugin-ostree @@ -1291,10 +1270,8 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti %attr(755,root,root) %dir %{_sysconfdir}/rhsm %attr(755,root,root) %dir %{_sysconfdir}/rhsm/ca -%if %{undefined centos} %attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem %attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem -%endif %if %use_cockpit %files -n subscription-manager-cockpit @@ -1433,6 +1410,18 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Wed May 20 2020 Christopher Snyder 1.27.4-1 +- Fix unit test of getting release information (jhnidek@redhat.com) +- Send Service-level during registration only once (csnyder@redhat.com) +- Refactoring of save_sla_to_syspurpose_metadata; ENT-2228 (jhnidek@redhat.com) +- 1823523: Detect rhsm-icon running without psutil (csnyder@redhat.com) +- 1830994: Fix warning messages in dnf/yum (jhnidek@redhat.com) +- 1815624: When in Simple Content Access mode, subscription-manager should not + complain that subscriptions aren't attached (wpoteat@redhat.com) +- Bump jquery from 3.4.1 to 3.5.0 in /cockpit + (49699333+dependabot[bot]@users.noreply.github.com) +- Bug fix of Makefile for Debian (63191606+mallmaluss@users.noreply.github.com) + * Mon Apr 27 2020 William Poteat 1.27.3-1 - 1771921: Package profiles sends too early when registering a client (wpoteat@redhat.com)