From a48e79a24cbd13b59277a3e688349f73c4c985a7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 19 2017 13:24:05 +0000 Subject: import subscription-manager-1.19.23-1.el7_4 --- diff --git a/.gitignore b/.gitignore index 72fee46..a4a2dde 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/subscription-manager-1.19.21.tar.gz +SOURCES/subscription-manager-1.19.23.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index fb78e3f..ea204df 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1 +1 @@ -233ba6e962c7846448fea2f68a08098b6f4ae04e SOURCES/subscription-manager-1.19.21.tar.gz +78267019c8258394bc17b804515e1f54e7db63dc SOURCES/subscription-manager-1.19.23.tar.gz diff --git a/SOURCES/subscription-manager-1.19.21-centos-remove-redhat.repo.patch b/SOURCES/subscription-manager-1.19.21-centos-remove-redhat.repo.patch deleted file mode 100644 index 1e72611..0000000 --- a/SOURCES/subscription-manager-1.19.21-centos-remove-redhat.repo.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNrp subscription-manager-1.19.21.orig/src/subscription_manager/repolib.py subscription-manager-1.19.21/src/subscription_manager/repolib.py ---- subscription-manager-1.19.21.orig/src/subscription_manager/repolib.py 2017-06-21 20:41:38.000000000 +0000 -+++ subscription-manager-1.19.21/src/subscription_manager/repolib.py 2017-08-02 11:42:10.445263785 +0000 -@@ -819,6 +819,7 @@ class RepoFile(ConfigParser): - return Repo(section, self.items(section)) - - def create(self): -+ return - if self.path_exists(self.path) or not self.manage_repos: - return - f = open(self.path, 'w') diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index 32d638e..fae3d38 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -7,7 +7,6 @@ %global use_initial_setup 1 %global rhsm_plugins_dir /usr/share/rhsm-plugins %global use_gtk3 %use_systemd -%global if_centos (0%{?centos_ver} && 0%{?centos_ver} >= 7) %if 0%{?rhel} == 7 %global use_initial_setup 1 @@ -61,7 +60,7 @@ %endif Name: subscription-manager -Version: 1.19.21 +Version: 1.19.23 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -76,13 +75,11 @@ URL: http://www.candlepinproject.org/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch999: subscription-manager-1.19.21-centos-remove-redhat.repo.patch - Requires: python-ethtool Requires: python-iniparse Requires: python-decorator Requires: virt-what -Requires: python-rhsm >= 1.19.9 +Requires: python-rhsm >= 1.19.10 Requires: python-decorator %if 0%{?sles_version} @@ -283,8 +280,6 @@ the remote in the currently deployed .origin file. %prep %setup -q -%patch999 -p1 - %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" %{?gtk_version} @@ -297,9 +292,8 @@ make -f Makefile install VERSION=%{version}-%{release} \ %{?install_ostree} %{?post_boot_tool} %{?gtk_version} \ %{?install_yum_plugins} %{?install_dnf_plugins} -#desktop-file-validate %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop -#desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-gui.desktop -rm %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop +desktop-file-validate %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop +desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-gui.desktop %find_lang rhsm %find_lang %{name} --with-gnome @@ -316,20 +310,12 @@ touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo %{__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 -%else -rm %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem -%endif %clean rm -rf %{buildroot} @@ -494,7 +480,7 @@ rm -rf %{buildroot} %{_datadir}/appdata/subscription-manager-gui.appdata.xml # gui system config files -#%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop +%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop %if !0%{?sles_version} %{_sysconfdir}/pam.d/subscription-manager-gui %{_sysconfdir}/security/console.apps/subscription-manager-gui @@ -527,9 +513,9 @@ rm -rf %{buildroot} %{rhsm_plugins_dir}/container_content.py* %{python_sitelib}/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 @@ -620,8 +606,18 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %changelog -* Wed Aug 2 2017 Johnny Hughes 1.19.21-1 -- Manual CentOS Debranding +* Fri Sep 01 2017 Kevin Howell 1.19.23-1 +- Bump python-rhsm requirement to 1.19.10 (khowell@redhat.com) +- 1481384: Improve error message for RateLimitExceededException + (jhnidek@redhat.com) + +* Wed Aug 30 2017 Kevin Howell 1.19.22-1 +- 1486549: Do not update redhat.repo at RateLimitExceededException + (jhnidek@redhat.com) +- 1486326: Add subscription-manager plugin to yum-config-manager + (khowell@redhat.com) +- 1486338: Properly initialize clean repo copy (khowell@redhat.com) +- 1484265: Force UTF-8 encoding in daemons (khowell@redhat.com) * Wed Jun 21 2017 Kevin Howell 1.19.21-1 - 1463765: Sync zanata translations (khowell@redhat.com)