From e859d9845a279b3cb801d2671958d22718ee5585 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Aug 04 2016 12:35:50 +0000
Subject: Manual CentOS Debranding


---

diff --git a/SOURCES/docker-latest.service b/SOURCES/docker-latest.service
index 9a4b741..3f7d076 100644
--- a/SOURCES/docker-latest.service
+++ b/SOURCES/docker-latest.service
@@ -3,7 +3,6 @@ Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
 After=network.target rhel-push-plugin.socket
 Wants=docker-latest-storage-setup.service
-Requires=rhel-push-plugin.socket
 
 [Service]
 Type=notify
@@ -13,7 +12,6 @@ EnvironmentFile=-/etc/sysconfig/docker-latest-storage
 EnvironmentFile=-/etc/sysconfig/docker-latest-network
 Environment=GOTRACEBACK=crash
 ExecStart=/usr/bin/docker-latest daemon \
-          --authorization-plugin=rhel-push-plugin \
           --exec-opt native.cgroupdriver=systemd \
           -g /var/lib/docker-latest \
           $OPTIONS \
diff --git a/SOURCES/docker-latest.sysconfig b/SOURCES/docker-latest.sysconfig
index 480d931..eb3cf96 100644
--- a/SOURCES/docker-latest.sysconfig
+++ b/SOURCES/docker-latest.sysconfig
@@ -8,7 +8,7 @@ DOCKER_CERT_PATH=/etc/docker
 # pull use the ADD_REGISTRY option to list a set of registries, each prepended
 # with --add-registry flag. The first registry added will be the first registry
 # searched.
-ADD_REGISTRY='--add-registry registry.access.redhat.com'
+#ADD_REGISTRY='--add-registry registry.access.redhat.com'
 
 # If you want to block registries from being used, uncomment the BLOCK_REGISTRY
 # option and give it a set of registries, each prepended with --block-registry
diff --git a/SPECS/docker-latest.spec b/SPECS/docker-latest.spec
index 9eaada2..11fb09e 100644
--- a/SPECS/docker-latest.spec
+++ b/SPECS/docker-latest.spec
@@ -87,7 +87,7 @@ Requires: selinux-policy >= %{selinux_policyver}
 
 Requires: %{repo}-selinux >= %{docker_ver}-%{docker_rel}
 Requires: %{repo}-common >= %{docker_ver}-%{docker_rel}
-Requires: %{repo}-rhel-push-plugin >= %{docker_ver}-%{docker_rel}
+#Requires: %{repo}-rhel-push-plugin >= %{docker_ver}-%{docker_rel}
 Requires: oci-register-machine >= 1:0-1.7
 Requires: oci-systemd-hook >= 1:0.1.4-4
 
@@ -252,11 +252,11 @@ install -p contrib/udev/80-%{repo}.rules %{buildroot}%{_udevrulesdir}/80-%{name}
 install -d %{buildroot}%{_sharedstatedir}/%{name}
 
 # install secret patch directory
-install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets
+#install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets
 # rhbz#1110876 - update symlinks for subscription management
-ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement
-ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm
-ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo
+#ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement
+#ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm
+#ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo
 
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.{com,io}
 ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.com/redhat-ca.crt
@@ -360,8 +360,8 @@ exit 0
 %{_unitdir}/%{name}.service
 %{_unitdir}/%{name}-storage-setup.service
 %{_datadir}/bash-completion/completions/%{name}
-%dir %{_datadir}/rhel
-%{_datadir}/rhel/*
+#%dir %{_datadir}/rhel
+#%{_datadir}/rhel/*
 %dir %{_sharedstatedir}/%{name}
 %{_udevrulesdir}/80-%{name}.rules
 %{_sysconfdir}/%{name}
@@ -398,6 +398,9 @@ exit 0
 
 
 %changelog
+* Thu Aug 04 2016 Johnny Hughes <johnny@centos.org>  - 1.10.3-46.10
+- Manual CentOS Debranding
+
 * Tue Jul 26 2016 Lokesh Mandvekar <lsm5@redhat.com> - 1.10.3-46.10
 - Resolves: #1361674 - update unitfile to remove the need for
 forward-journald