[packages/docker-registry] cleanup unused leftovers from docker-registry-v1

glen glen at pld-linux.org
Sun Oct 2 19:35:35 CEST 2016


commit 8d7fba3bcc69fc056b5b1db484c37f8a053a531f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Oct 2 20:35:03 2016 +0300

    cleanup unused leftovers from docker-registry-v1

 docker-registry.spec | 64 +---------------------------------------------------
 1 file changed, 1 insertion(+), 63 deletions(-)
---
diff --git a/docker-registry.spec b/docker-registry.spec
index 818c4fe..27b41df 100644
--- a/docker-registry.spec
+++ b/docker-registry.spec
@@ -1,7 +1,7 @@
 Summary:	Docker Registry 2.0
 Name:		docker-registry
 Version:	2.5.1
-Release:	0.1
+Release:	1
 License:	Apache v2.0
 Group:		Networking/Daemons
 Source0:	https://github.com/docker/distribution/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -12,15 +12,6 @@ Source2:	%{name}.sysconfig
 Source3:	%{name}.sysvinit
 BuildRequires:	golang >= 1.5
 BuildRequires:	rpmbuild(macros) >= 1.714
-%if 0
-BuildRequires:	systemd-devel
-Requires(post):	systemd
-Requires(preun):	systemd
-Requires(postun):	systemd
-Requires(post):	/sbin/chkconfig
-Requires(preun):	/sbin/chkconfig
-Requires(postun):	rc-scripts
-%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # go stuff
@@ -61,46 +52,9 @@ cd src/%{import_path}
 install -p bin/* $RPM_BUILD_ROOT%{_bindir}
 cp -p cmd/registry/config-dev.yml $RPM_BUILD_ROOT%{_sysconfdir}/docker/registry/config.yml
 
-%if 0
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
-	$RPM_BUILD_ROOT%{py_sitescriptdir}/%{name} \
-	$RPM_BUILD_ROOT%{systemdunitdir} \
-	$RPM_BUILD_ROOT%{_sharedstatedir}/%{name} \
-
-cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
-install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-
-# Make sure we set proper WorkingDir in the systemd service file
-sed -i "s|#WORKDIR#|%{py_sitescriptdir}/%{name}|" $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
-# Make sure we set proper working dir in the sysvinit file
-sed -i "s|#WORKDIR#|%{py_sitescriptdir}/%{name}|" $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-
-cp -a docker_registry tests $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if 0
-%post
-/sbin/chkconfig --add %{name}
-%systemd_post %{name}.service
-
-%preun
-if [ $1 -eq 0 ] ; then
-	%service %{name} stop
-	/sbin/chkconfig --del %{name}
-fi
-%systemd_preun %{name}.service
-
-%postun
-if [ "$1" -ge "1" ] ; then
-	%service %{name} condrestart
-fi
-%systemd_reload
-%endif
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS README.md ROADMAP.md
@@ -110,19 +64,3 @@ fi
 %attr(755,root,root) %{_bindir}/digest
 %attr(755,root,root) %{_bindir}/registry
 %attr(755,root,root) %{_bindir}/registry-api-descriptor-template
-
-%if 0
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%dir %{py_sitescriptdir}/%{name}
-%{py_sitescriptdir}/%{name}/*
-%dir %{_sharedstatedir}/%{name}
-%{systemdunitdir}/%{name}.service
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.yml
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%dir %{py_sitescriptdir}/%{name}
-%{py_sitescriptdir}/%{name}/*
-%dir %{_sharedstatedir}/%{name}
-%{systemdunitdir}/%{name}.service
-%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/docker-registry.git/commitdiff/8d7fba3bcc69fc056b5b1db484c37f8a053a531f



More information about the pld-cvs-commit mailing list