From 4400bb6817880fa9e8fb11b19b4e5c5f6aacfee8 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Jan 23 2017 13:55:09 +0000
Subject: Manual CentOS Debranding


---

diff --git a/SOURCES/docker-latest.service b/SOURCES/docker-latest.service
index d59ca00..efc4cfb 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
@@ -17,7 +16,6 @@ Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin
 ExecStart=/usr/bin/dockerd-latest \
           --add-runtime docker-runc=/usr/libexec/docker/docker-runc-latest \
           --default-runtime=docker-runc \
-          --authorization-plugin=rhel-push-plugin \
           --exec-opt native.cgroupdriver=systemd \
           --userland-proxy-path=/usr/libexec/docker/docker-proxy-latest \
           -g /var/lib/docker-latest \
diff --git a/SOURCES/docker-latest.sysconfig b/SOURCES/docker-latest.sysconfig
index 740654e..970bbe7 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 f96a932..77dfd9d 100644
--- a/SPECS/docker-latest.spec
+++ b/SPECS/docker-latest.spec
@@ -111,7 +111,7 @@ Requires(pre): selinux-policy >= %{selinux_policyver}
 Requires(pre): container-selinux >= %{docker_epoch}:%{docker_ver}-%{docker_rel}
 Requires: %{repo}-common >= %{docker_epoch}:%{docker_ver}-%{docker_rel}
 Requires: %{repo}-client-latest = %{version}-%{release}
-Requires: %{repo}-rhel-push-plugin >= %{docker_epoch}:%{docker_ver}-%{docker_rel}
+#Requires: %{repo}-rhel-push-plugin >= %{docker_epoch}:%{docker_ver}-%{docker_rel}
 Requires: oci-register-machine >= 1:0-1.11
 Requires: oci-systemd-hook >= 1:0.1.4-8
 Requires(post): systemd
@@ -198,9 +198,9 @@ Requires: %{repo}-common
 cp %{SOURCE9} .
 
 # rhel debranding for centos
-%if 0%{?centos}
-sed -i 's/ADD_REGISTRY/#ADD_REGISTRY/' %{SOURCE6}
-%endif
+#%if 0%{?centos}
+#sed -i 's/ADD_REGISTRY/#ADD_REGISTRY/' %{SOURCE6}
+#%endif
 
 # untar d-s-s
 tar zxf %{SOURCE1}
@@ -221,7 +221,7 @@ pushd runc-%{commit8}
 %patch0 -p1
 popd
 
-# untar docker-containerd
+## untar docker-containerd
 tar zxf %{SOURCE12}
 
 # docker-containerd unitfile
@@ -341,11 +341,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
@@ -455,8 +455,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}
@@ -503,6 +503,9 @@ exit 0
 %endif # with_migrator
 
 %changelog
+* Mon Jan 23 2017 Johnny Hughes <johnny@centos.org> - 1.12.5-14
+- Manual CentOS Debranding
+ 
 * Wed Jan 11 2017 Lokesh Mandvekar <lsm5@redhat.com> - 1.12.5-14
 - keep version-release consistent with docker