diff --git a/SOURCES/0001-debrand-warnings.patch b/SOURCES/0001-debrand-warnings.patch new file mode 100644 index 0000000..b923669 --- /dev/null +++ b/SOURCES/0001-debrand-warnings.patch @@ -0,0 +1,29 @@ +From c7e34692c6f38486716d3db6779f27762b1e9739 Mon Sep 17 00:00:00 2001 +From: Jim Perrin +Date: Fri, 20 Jun 2014 10:04:02 -0500 +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 30d0555..f4000c3 100644 +--- a/src/plugins/subscription-manager.py ++++ b/src/plugins/subscription-manager.py +@@ -39,10 +39,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." + + + def update(conduit, cache_only): +-- +1.8.3.1 + diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index 6248ba0..0b03e6a 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -32,6 +32,7 @@ Patch3: subscription-manager-1.10.14-4-to-subscription-manager-1.10.14-5.patch Patch4: subscription-manager-1.10.14-5-to-subscription-manager-1.10.14-6.patch Patch5: subscription-manager-1.10.14-6-to-subscription-manager-1.10.14-7.patch Patch6: subscription-manager-1.10.14-7-to-subscription-manager-1.10.14-8.patch +Patch1001: 0001-debrand-warnings.patch URL: https://fedorahosted.org/subscription-manager/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -156,6 +157,7 @@ subscriptions %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch1001 -p1 %build make -f Makefile CFLAGS="%{optflags}" @@ -164,8 +166,9 @@ make -f Makefile CFLAGS="%{optflags}" rm -rf %{buildroot} make -f Makefile install VERSION=%{version}-%{release} PREFIX=%{buildroot} MANPATH=%{_mandir} -desktop-file-validate \ - %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop +#desktop-file-validate \ +# By default this will nag on CentOS. remove it. +rm %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop desktop-file-validate \ %{buildroot}/usr/share/applications/subscription-manager-gui.desktop @@ -349,7 +352,7 @@ rm -rf %{buildroot} %attr(755,root,root) %{_bindir}/subscription-manager-gui %{_bindir}/rhsm-icon -%{_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 @@ -433,6 +436,10 @@ fi %endif %changelog +* Fri Jun 20 2014 Jim Perrin 1.10.14-8.el7.centos +- Remove rhsm autostart +- add patch to debrand warnings + * Tue May 27 2014 ckozak 1.10.14-8 - 1098891: Update repos, persisting local settings when possible (ckozak@redhat.com)