From 65d2e6192d33db7bcfeab45a4bc4e554f9a9475a Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Sep 07 2017 17:34:42 +0000
Subject: Manual CentOS Debranding


---

diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/docker.service b/SOURCES/docker.service
index 8af4c34..b62f55e 100644
--- a/SOURCES/docker.service
+++ b/SOURCES/docker.service
@@ -3,7 +3,6 @@ Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
 After=network.target
 Wants=docker-storage-setup.service
-Requires=rhel-push-plugin.socket registries.service
 Requires=docker-cleanup.timer
 
 [Service]
@@ -19,7 +18,6 @@ Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin
 ExecStart=/usr/bin/dockerd-current \
           --add-runtime docker-runc=/usr/libexec/docker/docker-runc-current \
           --default-runtime=docker-runc \
-          --authorization-plugin=rhel-push-plugin \
           --exec-opt native.cgroupdriver=systemd \
           --userland-proxy-path=/usr/libexec/docker/docker-proxy-current \
           $OPTIONS \
diff --git a/SPECS/docker.spec b/SPECS/docker.spec
index 07113cd..b53cec5 100644
--- a/SPECS/docker.spec
+++ b/SPECS/docker.spec
@@ -46,9 +46,9 @@
 %global shortcommit_novolume %(c=%{commit_novolume}; echo ${c:0:7})
 
 # rhel-push-plugin
-%global git_rhel_push https://github.com/projectatomic/rhel-push-plugin
-%global commit_rhel_push af9107b2aedb235338e32a3c19507cad3f218b0d
-%global shortcommit_rhel_push %(c=%{commit_rhel_push}; echo ${c:0:7})
+#%global git_rhel_push https://github.com/projectatomic/rhel-push-plugin
+#%global commit_rhel_push af9107b2aedb235338e32a3c19507cad3f218b0d
+#%global shortcommit_rhel_push %(c=%{commit_rhel_push}; echo ${c:0:7})
 
 # docker-lvm-plugin
 %global git_lvm https://github.com/projectatomic/%{repo}-lvm-plugin
@@ -80,7 +80,7 @@ URL: https://%{import_path}
 Source0: %{git_docker}/archive/%{commit_docker}.tar.gz
 Source2: %{git_dss}/archive/%{commit_dss}/container-storage-setup-%{shortcommit_dss}.tar.gz
 Source4: %{git_novolume}/archive/%{commit_novolume}/%{repo}-novolume-plugin-%{shortcommit_novolume}.tar.gz
-Source5: %{git_rhel_push}/archive/%{commit_rhel_push}/rhel-push-plugin-%{shortcommit_rhel_push}.tar.gz
+#Source5: %{git_rhel_push}/archive/%{commit_rhel_push}/rhel-push-plugin-%{shortcommit_rhel_push}.tar.gz
 Source6: %{git_lvm}/archive/%{commit_lvm}/%{repo}-lvm-plugin-%{shortcommit_lvm}.tar.gz
 Source8: %{name}.service
 Source9: %{name}.sysconfig
@@ -122,8 +122,8 @@ Requires(preun): systemd
 Requires(postun): systemd
 Requires: xz
 Requires: device-mapper-libs >= 7:1.02.97
-Requires: subscription-manager-plugin-container
-Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release}
+#Requires: subscription-manager-plugin-container
+#Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release}
 Requires: oci-register-machine >= 1:0-3.10
 Requires: oci-systemd-hook >= 1:0.1.4-9
 Provides: lxc-%{name} = %{epoch}:%{version}-%{release}
@@ -227,16 +227,16 @@ local volumes defined. In particular, the plugin will block `docker run` with:
 
 The only thing allowed will be just bind mounts.
 
-%package rhel-push-plugin
-License: GPLv2
-Summary: Avoids pushing a RHEL-based image to docker.io registry
+#%package rhel-push-plugin
+#License: GPLv2
+#Summary: Avoids pushing a RHEL-based image to docker.io registry
 
-%description rhel-push-plugin
-In order to use this plugin you must be running at least Docker 1.10 which
-has support for authorization plugins.
+#%description rhel-push-plugin
+#In order to use this plugin you must be running at least Docker 1.10 which
+#has support for authorization plugins.
 
-This plugin avoids any RHEL based image to be pushed to the default docker.io
-registry preventing users to violate the RH subscription agreement.
+#This plugin avoids any RHEL based image to be pushed to the default docker.io
+#registry preventing users to violate the RH subscription agreement.
 
 %package lvm-plugin
 License: LGPLv3
@@ -272,7 +272,7 @@ tar zxf %{SOURCE2}
 tar zxf %{SOURCE4}
 
 # untar rhel-push-plugin
-tar zxf %{SOURCE5}
+#tar zxf %{SOURCE5}
 
 # untar lvm-plugin
 tar zxf %{SOURCE6}
@@ -322,7 +322,7 @@ pushd _build
   mkdir -p src/%{provider}.%{provider_tld}/{%{name},projectatomic}
   ln -s $(dirs +1 -l) src/%{import_path}
   ln -s $(dirs +1 -l)/%{repo}-novolume-plugin-%{commit_novolume} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin
-  ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit_rhel_push} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
+#  ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit_rhel_push} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
   ln -s $(dirs +1 -l)/%{repo}-lvm-plugin-%{commit_lvm} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-lvm-plugin
 popd
 
@@ -331,10 +331,10 @@ pushd $(pwd)/_build/src
 %gobuild %{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin
 popd
 
-export GOPATH=$(pwd)/rhel-push-plugin-%{commit_rhel_push}/Godeps/_workspace:$(pwd)/_build
-pushd $(pwd)/_build/src
-%gobuild %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
-popd
+#export GOPATH=$(pwd)/rhel-push-plugin-%{commit_rhel_push}/Godeps/_workspace:$(pwd)/_build
+#pushd $(pwd)/_build/src
+#%gobuild %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
+#popd
 
 export GOPATH=$(pwd)/%{repo}-lvm-plugin-%{commit_lvm}/vendor:$(pwd)/_build
 pushd $(pwd)/_build/src
@@ -348,7 +348,7 @@ export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
 # build %%{name} manpages
 man/md2man-all.sh
 go-md2man -in %{repo}-novolume-plugin-%{commit_novolume}/man/%{repo}-novolume-plugin.8.md -out %{repo}-novolume-plugin.8
-go-md2man -in rhel-push-plugin-%{commit_rhel_push}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8
+#go-md2man -in rhel-push-plugin-%{commit_rhel_push}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8
 go-md2man -in %{repo}-lvm-plugin-%{commit_lvm}/man/%{repo}-lvm-plugin.8.md -out %{repo}-lvm-plugin.8
 
 # build %%{name} binary
@@ -472,11 +472,11 @@ rm -rf %{buildroot}%{_sharedstatedir}/%{name}-unit-test/contrib/init/openrc/%{na
 %endif
 
 # install secrets dir
-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}/etc/%{name}/certs.d/redhat.{com,io}
 mkdir -p %{buildroot}/etc/%{name}/certs.d/registry.access.redhat.com
@@ -504,12 +504,12 @@ install -d %{buildroot}%{_mandir}/man8
 install -p -m 644 %{repo}-novolume-plugin.8 %{buildroot}%{_mandir}/man8
 
 # install rhel-push-plugin executable, unitfile, socket and man
-install -d %{buildroot}%{_libexecdir}/%{repo}
-install -p -m 755 _build/src/rhel-push-plugin %{buildroot}%{_libexecdir}/%{repo}/rhel-push-plugin
-install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service
-install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.socket %{buildroot}%{_unitdir}/rhel-push-plugin.socket
-install -d %{buildroot}%{_mandir}/man8
-install -p -m 644 rhel-push-plugin.8 %{buildroot}%{_mandir}/man8
+#install -d %{buildroot}%{_libexecdir}/%{repo}
+#install -p -m 755 _build/src/rhel-push-plugin %{buildroot}%{_libexecdir}/%{repo}/rhel-push-plugin
+#install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service
+#install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.socket %{buildroot}%{_unitdir}/rhel-push-plugin.socket
+#install -d %{buildroot}%{_mandir}/man8
+#install -p -m 644 rhel-push-plugin.8 %{buildroot}%{_mandir}/man8
 
 # install %%{repo}-lvm-plugin executable, unitfile, socket and man
 install -d %{buildroot}/%{_libexecdir}/%{repo}
@@ -590,14 +590,14 @@ exit 0
 %postun novolume-plugin
 %systemd_postun_with_restart %{name}-novolume-plugin.service
 
-%post rhel-push-plugin
-%systemd_post rhel-push-plugin.service
+#%post rhel-push-plugin
+#%systemd_post rhel-push-plugin.service
 
-%preun rhel-push-plugin
-%systemd_preun rhel-push-plugin.service
+#%preun rhel-push-plugin
+#%systemd_preun rhel-push-plugin.service
 
-%postun rhel-push-plugin
-%systemd_postun_with_restart rhel-push-plugin.service
+#%postun rhel-push-plugin
+#%systemd_postun_with_restart rhel-push-plugin.service
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -617,8 +617,8 @@ exit 0
 %{_mandir}/man1/%{name}*.1.gz
 %{_mandir}/man5/*.5.gz
 %{_mandir}/man8/%{name}d.8.gz
-%dir %{_datadir}/rhel
-%{_datadir}/rhel/*
+#%dir %{_datadir}/rhel
+#%{_datadir}/rhel/*
 %{_unitdir}/%{name}.service
 %{_unitdir}/%{name}-storage-setup.service
 %{_datadir}/bash-completion/completions/%{name}
@@ -672,12 +672,12 @@ exit 0
 %{_libexecdir}/%{repo}/%{repo}-novolume-plugin
 %{_unitdir}/%{repo}-novolume-plugin.*
 
-%files rhel-push-plugin
-%license rhel-push-plugin-%{commit_rhel_push}/LICENSE
-%doc rhel-push-plugin-%{commit_rhel_push}/README.md
-%{_mandir}/man8/rhel-push-plugin.8.gz
-%{_libexecdir}/%{repo}/rhel-push-plugin
-%{_unitdir}/rhel-push-plugin.*
+#%files rhel-push-plugin
+#%license rhel-push-plugin-%{commit_rhel_push}/LICENSE
+#%doc rhel-push-plugin-%{commit_rhel_push}/README.md
+#%{_mandir}/man8/rhel-push-plugin.8.gz
+#%{_libexecdir}/%{repo}/rhel-push-plugin
+#%{_unitdir}/rhel-push-plugin.*
 
 %files lvm-plugin
 %license %{repo}-lvm-plugin-%{commit_lvm}/LICENSE
@@ -702,6 +702,9 @@ exit 0
 %config(noreplace) %{_sysconfdir}/oci-umount.conf
 
 %changelog
+* Thu Sep  7 2017 Johnny Hughes <johnny@centos.org> - 2:1.12.6-48.git0fdc778
+- Manual CentOS Debranding
+
 * Thu Jul 20 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-48.git0fdc778
 - built docker @projectatomic/docker-1.12.6 commit 0fdc778
 - built docker-novolume-plugin commit 385ec70