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/0001-debrand-warnings.patch b/SOURCES/0001-debrand-warnings.patch new file mode 100644 index 0000000..bd5eb02 --- /dev/null +++ b/SOURCES/0001-debrand-warnings.patch @@ -0,0 +1,29 @@ +From 2d17b1b9a8d0342e88a666a2fdb4bee2de7b5fa6 Mon Sep 17 00:00:00 2001 +From: Jim Perrin +Date: Fri, 20 Nov 2015 08:11:30 -0600 +Subject: [PATCH] debrand warnings + +--- + src/plugins/subscription-manager.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/subscription-manager.py b/src/plugins/subscription-manager.py +index f5fffa3..2a6b2e7 100644 +--- a/src/plugins/subscription-manager.py ++++ b/src/plugins/subscription-manager.py +@@ -44,10 +44,10 @@ The subscription for following product(s) has expired: + You no longer have access to the repositories that provide these products. It is important that you apply an active subscription in order to resume access to security and other critical updates. If you don't have other active subscriptions, you can renew the expired subscription. """ + + not_registered_warning = \ +-"This system is not registered to Red Hat Subscription Management. You can use subscription-manager to register." ++"This system is not registered with Subscription Management. You can use subscription-manager to register." + + no_subs_warning = \ +-"This system is registered to Red Hat Subscription Management, but is not receiving updates. You can use subscription-manager to assign subscriptions." ++"This system is registered with Subscription Management, but is not receiving updates. You can use subscription-manager to assign subscriptions." + + + # If running from the yum plugin, we want to avoid blocking +-- +1.8.3.1 + diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index 198ca34..feae49f 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -8,6 +8,7 @@ %global rhsm_plugins_dir /usr/share/rhsm-plugins %global use_gtk3 %use_systemd %global rhel7_minor %(%{__grep} -o "7.[0-9]*" /etc/redhat-release |%{__sed} -s 's/7.//') +%global if_centos (0%{?centos_ver} && 0%{?centos_ver} >= 7) %if 0%{?rhel} == 7 %global use_initial_setup 1 @@ -74,6 +75,7 @@ Patch10: subscription-manager-1.15.9-11-to-subscription-manager-1.15.9-12.patch Patch11: subscription-manager-1.15.9-12-to-subscription-manager-1.15.9-13.patch Patch12: subscription-manager-1.15.9-13-to-subscription-manager-1.15.9-14.patch Patch13: subscription-manager-1.15.9-14-to-subscription-manager-1.15.9-15.patch +Patch1001: 0001-debrand-warnings.patch URL: http://www.candlepinproject.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -169,9 +171,9 @@ from the server. Populates /etc/docker/certs.d appropriately. %{rhsm_plugins_dir}/container_content.py* %{_datadir}/rhsm/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 %package -n subscription-manager-gui Summary: A GUI interface to manage Red Hat product subscriptions @@ -270,8 +272,9 @@ make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" LDFLAGS="%{_ rm -rf %{buildroot} make -f Makefile install VERSION=%{version}-%{release} PREFIX=%{buildroot} MANPATH=%{_mandir} OS_VERSION=%{?fedora}%{?rhel} OS_DIST=%{dist} %{?gtk_version} %{?install_ostree} %{?post_boot_tool} -desktop-file-validate \ - %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop +#desktop-file-validate \ +# %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop +rm %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop desktop-file-validate \ %{buildroot}/usr/share/applications/subscription-manager-gui.desktop @@ -291,14 +294,22 @@ 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 # The normal redhat-uep.pem is actually a bundle of three CAs. Docker does not handle bundles well # and only reads the first CA in the bundle. We need to put the right CA a file by itself. +%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 %post -n subscription-manager-gui touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -484,7 +495,7 @@ rm -rf %{buildroot} %{_datadir}/rhsm/subscription_manager/gui/*.py* # gui system config files -%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop +#%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop %{_sysconfdir}/pam.d/subscription-manager-gui %{_sysconfdir}/security/console.apps/subscription-manager-gui %{_sysconfdir}/bash_completion.d/subscription-manager-gui @@ -570,6 +581,9 @@ fi %endif %changelog +* Fri Nov 20 2015 Jim Perrin 1.15.9-15 +- initial debrand following point release update + * Tue Oct 13 2015 Chris Rog 1.15.9-15 - 1254460: Fixed the credits button in the about dialog in subman GUI (crog@redhat.com)