[packages/gitlab-workhorse] use make install to ensure all binaries get installed

[glen]

commit 0d57fdb55b6ae7b3d0caa1dfe793c8f92542527b
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sun Dec 17 20:56:17 2017 +0200

    use make install to ensure all binaries get installed

 gitlab-workhorse.spec | 13 ++++++++++---
 paths.patch           | 13 +++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/gitlab-workhorse.spec b/gitlab-workhorse.spec
index d58c9ea..6afbd25 100644
--- a/gitlab-workhorse.spec
+++ b/gitlab-workhorse.spec
@@ -9,6 +9,7 @@ Source0:	https://gitlab.com/gitlab-org/gitlab-workhorse/repository/archive.tar.b
 Source1:	%{name}.service
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
+Patch0:		paths.patch
 URL:		https://gitlab.com/gitlab-org/gitlab-workhorse
 BuildRequires:	git-core
 BuildRequires:	golang >= 1.8
@@ -27,6 +28,7 @@ push/pull and Git archive downloads.
 %prep
 %setup -qc
 mv %{name}-v%{version}-*/* .
+%patch0 -p1
 
 %build
 # make version similar when built from git:
@@ -42,9 +44,12 @@ grep "$version" v
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{systemdunitdir},/etc/{rc.d/init.d,sysconfig}}
+install -d $RPM_BUILD_ROOT{%{systemdunitdir},/etc/{rc.d/init.d,sysconfig}}
+
+%{__make} install \
+	PREFIX=%{_prefix} \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install -p %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
@@ -72,5 +77,7 @@ fi
 %doc CHANGELOG README.md LICENSE
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(755,root,root) %{_sbindir}/%{name}
+%attr(755,root,root) %{_sbindir}/gitlab-workhorse
+%attr(755,root,root) %{_sbindir}/gitlab-zip-cat
+%attr(755,root,root) %{_sbindir}/gitlab-zip-metadata
 %{systemdunitdir}/%{name}.service
diff --git a/paths.patch b/paths.patch
new file mode 100644
index 0000000..2ee2919
--- /dev/null
+++ b/paths.patch
@@ -0,0 +1,13 @@
+--- gitlab-workhorse-3.3.1/Makefile~	2017-11-14 15:36:10.000000000 +0200
++++ gitlab-workhorse-3.3.1/Makefile	2017-12-17 20:55:39.919871923 +0200
+@@ -19,8 +19,8 @@
+ 	${GOBUILD} -o ${BUILD_DIR}/$@ ${PKG}
+ 
+ install: gitlab-workhorse gitlab-zip-cat gitlab-zip-metadata
+-	mkdir -p $(DESTDIR)${PREFIX}/bin/
+-	cd ${BUILD_DIR} && install gitlab-workhorse gitlab-zip-cat gitlab-zip-metadata ${DESTDIR}${PREFIX}/bin/
++	mkdir -p $(DESTDIR)${PREFIX}/sbin/
++	cd ${BUILD_DIR} && install gitlab-workhorse gitlab-zip-cat gitlab-zip-metadata ${DESTDIR}${PREFIX}/sbin/
+ 
+ ${BUILD_DIR}/_build:
+ 	mkdir -p $@/src/${PKG}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-workhorse.git/commitdiff/0d57fdb55b6ae7b3d0caa1dfe793c8f92542527b