From 51b3eceb89103ae8a4b332f4dcf1511ddb65f757 Mon Sep 17 00:00:00 2001
From: Jim Perrin <jperrin@centos.org>
Date: Mar 12 2015 15:51:17 +0000
Subject: add distro check and certificate removal


---

diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec
index e04eca9..a8c8dcc 100644
--- a/SPECS/subscription-manager.spec
+++ b/SPECS/subscription-manager.spec
@@ -104,7 +104,6 @@ the remote in the currently deployed .origin file.
 %{_datadir}/rhsm/subscription_manager/plugin/ostree/*.py*
 %endif
 
-%if 0%{!?centos_ver}
 %package -n subscription-manager-plugin-container
 Summary: A plugin for handling container content.
 Group: System Environment/Base
@@ -118,12 +117,14 @@ from the server. Populates /etc/docker/certs.d appropriately.
 %{_sysconfdir}/rhsm/pluginconf.d/container_content.ContainerContentPlugin.conf
 %{rhsm_plugins_dir}/container_content.py*
 %{_datadir}/rhsm/subscription_manager/plugin/container.py*
+
+%if 0%{!?if_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}/rhsm/ca/redhat-entitlement-authority.pem
 %attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt
 %endif
-%
+
 %package -n subscription-manager-gui
 Summary: A GUI interface to manage Red Hat product subscriptions
 Group: System Environment/Base
@@ -213,13 +214,23 @@ mkdir -p %{buildroot}%{_sysconfdir}/pki/entitlement
 
 # Setup cert directories for the container plugin:
 mkdir -p %{buildroot}%{_sysconfdir}/docker/certs.d/
+
+%if 0%{!?if_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
+%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.
 mkdir -p %{buildroot}%{_sysconfdir}/etc/rhsm/ca
+
+%if 0%{!?if_centos}
 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 || :
@@ -485,6 +496,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar 12 2015 Jim Perrin <jperrin@centos.org> - 1.13.22-1.el7.centos
+- add global check for centos. patch out rh certs if distro = centos
+
 * Thu Mar 05 2015 CentOS Sources <bugs@centos.org> - 1.13.22-1.el7.centos
 - Remove rhsm autostart
 - Remove branding in warning messages