From f5c6bcf8faef41d0fc10a90f3cdc1532ea40d930 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 05 2015 13:28:34 +0000
Subject: debrand subscription-manager-1.13.22-1.el7


---

diff --git a/SOURCES/centos-debrand-warnings.patch b/SOURCES/centos-debrand-warnings.patch
new file mode 100644
index 0000000..b923669
--- /dev/null
+++ b/SOURCES/centos-debrand-warnings.patch
@@ -0,0 +1,29 @@
+From c7e34692c6f38486716d3db6779f27762b1e9739 Mon Sep 17 00:00:00 2001
+From: Jim Perrin <jperrin@centos.org>
+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 4650743..7ef54e1 100644
--- a/SPECS/subscription-manager.spec
+++ b/SPECS/subscription-manager.spec
@@ -21,6 +21,7 @@
 %endif
 
 Name: subscription-manager
+Patch1:	centos-debrand-warnings.patch
 Version: 1.13.22
 Release: 1%{?dist}
 Summary: Tools and libraries for subscription and repository management
@@ -180,6 +181,7 @@ subscriptions
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 make -f Makefile CFLAGS="%{optflags}"
@@ -188,8 +190,9 @@ make -f Makefile CFLAGS="%{optflags}"
 rm -rf %{buildroot}
 make -f Makefile install VERSION=%{version}-%{release} PREFIX=%{buildroot} MANPATH=%{_mandir} OS_VERSION=%{?fedora}%{?rhel} %{?install_ostree}
 
-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
@@ -401,7 +404,7 @@ rm -rf %{buildroot}
 %{_datadir}/appdata/subscription-manager-gui.appdata.xml
 
 %{_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
@@ -480,6 +483,10 @@ fi
 %endif
 
 %changelog
+* Thu Mar 05 2015 CentOS Sources <bugs@centos.org> - 1.13.22-1.el7.centos
+- Remove rhsm autostart
+- Remove branding in warning messages
+
 * Thu Feb 19 2015 Devan Goodwin <dgoodwin@rm-rf.ca> 1.13.22-1
 - 1191241: Handle network starting after subman does. (alikins@redhat.com)