From e75a68807fda605167cae92752f23a61b67db466 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Mar 06 2017 23:24:12 +0000
Subject: Manual CentOS Rebranding


---

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 ae046d4..af79ee3 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
 Requires=docker-cleanup.timer
 
 [Service]
@@ -18,7 +17,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/SOURCES/docker.sysconfig b/SOURCES/docker.sysconfig
index de10538..031bd6b 100644
--- a/SOURCES/docker.sysconfig
+++ b/SOURCES/docker.sysconfig
@@ -10,7 +10,7 @@ fi
 # 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.spec b/SPECS/docker.spec
index 4f21b4f..740cd09 100644
--- a/SPECS/docker.spec
+++ b/SPECS/docker.spec
@@ -47,9 +47,9 @@
 %global shortcommit4 %(c=%{commit4}; echo ${c:0:7})
 
 # rhel-push-plugin
-%global git5 https://github.com/projectatomic/rhel-push-plugin
-%global commit5 70653ed7cbef7623ab850d09f0257a6b670582ce
-%global shortcommit5 %(c=%{commit5}; echo ${c:0:7})
+#%global git5 https://github.com/projectatomic/rhel-push-plugin
+#%global commit5 70653ed7cbef7623ab850d09f0257a6b670582ce
+#%global shortcommit5 %(c=%{commit5}; echo ${c:0:7})
 
 # docker-lvm-plugin
 %global git6 https://github.com/projectatomic/%{repo}-lvm-plugin
@@ -77,7 +77,7 @@ ExclusiveArch: x86_64
 Source0: %{git0}/archive/%{commit0}.tar.gz
 Source2: %{git2}/archive/%{commit2}/%{repo}-storage-setup-%{shortcommit2}.tar.gz
 Source4: %{git4}/archive/%{commit4}/%{repo}-novolume-plugin-%{shortcommit4}.tar.gz
-Source5: %{git5}/archive/%{commit5}/rhel-push-plugin-%{shortcommit5}.tar.gz
+#Source5: %{git5}/archive/%{commit5}/rhel-push-plugin-%{shortcommit5}.tar.gz
 Source6: %{git6}/archive/%{commit6}/%{repo}-lvm-plugin-%{shortcommit6}.tar.gz
 Source8: %{name}.service
 Source9: %{name}.sysconfig
@@ -116,8 +116,8 @@ Requires(preun): systemd
 Requires(postun): systemd
 Requires: xz
 Requires: device-mapper-libs >= 7:1.02.97
-Requires: subscription-manager
-Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release}
+#Requires: subscription-manager
+#Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release}
 Requires: oci-register-machine >= 1:0-1.11
 Requires: oci-systemd-hook >= 1:0.1.4-9
 Provides: lxc-%{name} = %{epoch}:%{version}-%{release}
@@ -218,16 +218,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
@@ -250,7 +250,7 @@ tar zxf %{SOURCE2}
 tar zxf %{SOURCE4}
 
 # untar rhel-push-plugin
-tar zxf %{SOURCE5}
+#tar zxf %{SOURCE5}
 
 # untar lvm-plugin
 tar zxf %{SOURCE6}
@@ -293,7 +293,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-%{commit4} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin
-  ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit5} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
+#  ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit5} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
   ln -s $(dirs +1 -l)/%{repo}-lvm-plugin-%{commit6} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-lvm-plugin
 popd
 
@@ -302,10 +302,10 @@ pushd $(pwd)/_build/src
 %gobuild %{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin
 popd
 
-export GOPATH=$(pwd)/rhel-push-plugin-%{commit5}/Godeps/_workspace:$(pwd)/_build
-pushd $(pwd)/_build/src
-%gobuild %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
-popd
+#export GOPATH=$(pwd)/rhel-push-plugin-%{commit5}/Godeps/_workspace:$(pwd)/_build
+#pushd $(pwd)/_build/src
+#%gobuild %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
+#popd
 
 export GOPATH=$(pwd)/%{repo}-lvm-plugin-%{commit6}/vendor:$(pwd)/_build
 pushd $(pwd)/_build/src
@@ -319,7 +319,7 @@ export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
 # build %%{name} manpages
 man/md2man-all.sh
 go-md2man -in %{repo}-novolume-plugin-%{commit4}/man/%{repo}-novolume-plugin.8.md -out %{repo}-novolume-plugin.8
-go-md2man -in rhel-push-plugin-%{commit5}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8
+#go-md2man -in rhel-push-plugin-%{commit5}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8
 go-md2man -in %{repo}-lvm-plugin-%{commit6}/man/%{repo}-lvm-plugin.8.md -out %{repo}-lvm-plugin.8
 
 # build %%{name} binary
@@ -433,11 +433,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}
 ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}/%{_sysconfdir}/%{name}/certs.d/redhat.com/redhat-ca.crt
@@ -467,12 +467,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-%{commit5}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service
-install -p -m 644 rhel-push-plugin-%{commit5}/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-%{commit5}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service
+#install -p -m 644 rhel-push-plugin-%{commit5}/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}
@@ -541,14 +541,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}
@@ -567,8 +567,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
 %{_unitdir}/%{name}-cleanup.service
@@ -624,12 +624,12 @@ exit 0
 %{_libexecdir}/%{repo}/%{repo}-novolume-plugin
 %{_unitdir}/%{repo}-novolume-plugin.*
 
-%files rhel-push-plugin
-%license rhel-push-plugin-%{commit5}/LICENSE
-%doc rhel-push-plugin-%{commit5}/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-%{commit5}/LICENSE
+#%doc rhel-push-plugin-%{commit5}/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-%{commit6}/LICENSE
@@ -645,6 +645,9 @@ exit 0
 %{_bindir}/%{name}-v1.10-migrator-*
 
 %changelog
+* Mon Mar  6 2017 Johnny Hughes <johnny@centos.org> - 2:1.12.6-11
+- Manual CentOS Branding Changes
+
 * Thu Feb 23 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-11
 - Resolves: #1426290
 - built docker @projectatomic/docker-1.12.6 commit 96d83a5