[packages/gitlab-workhorse] systemd setup

glen glen at pld-linux.org
Sat Apr 16 12:33:52 CEST 2016


commit 7d3229e0d9dc458c0f736b64840da13f05f5c295
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 16 13:33:33 2016 +0300

    systemd setup

 gitlab-workhorse.spec | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/gitlab-workhorse.spec b/gitlab-workhorse.spec
index 91381ec..68a1c8b 100644
--- a/gitlab-workhorse.spec
+++ b/gitlab-workhorse.spec
@@ -1,11 +1,7 @@
-#
-# Conditional build:
-%bcond_with systemd
-
 Summary:	An HTTP daemon that serves Git clients
 Name:		gitlab-workhorse
 Version:	0.7.1
-Release:	0.2
+Release:	0.3
 License:	MIT
 Group:		Development/Building
 # md5 deliberately omitted until this package is useful
@@ -33,15 +29,14 @@ mv %{name}-v%{version}-*/* .
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
-%if %{with systemd}
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
-%endif
+install -d $RPM_BUILD_ROOT{%{_sbindir}/%{name},%{systemdunitdir}}
+
+install -p %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with systemd}
 %preun
 %systemd_preun %{name}.service
 
@@ -49,13 +44,10 @@ rm -rf $RPM_BUILD_ROOT
 %systemd_post %{name}.service
 
 %postun
-%systemd_postun_with_restart %{name}.service
-%endif
+%systemd_reload
 
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG README.md LICENSE
 %attr(755,root,root) %{_sbindir}/%{name}
-%if %{with systemd}
 %{systemdunitdir}/%{name}.service
-%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-workhorse.git/commitdiff/7d3229e0d9dc458c0f736b64840da13f05f5c295



More information about the pld-cvs-commit mailing list