[packages/gitlab-ce] solve deps for install
glen
glen at pld-linux.org
Fri Apr 15 23:51:05 CEST 2016
commit a92c651e20f227b6404db5793ed26fbcb577e1f8
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Apr 16 00:50:58 2016 +0300
solve deps for install
gitlab-ce.spec | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index dbcd9f8..ecbec4b 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -4,7 +4,7 @@
# way how it should be done, but GitLab has too many dependencies that it will
# be too difficult to maintain them via distro packages.
#
-# install notes: https://gitlab.com/gitlab-org/gitlab-ce/blob/v8.6.3/doc/install/installation.md
+# install notes: https://gitlab.com/gitlab-org/gitlab-ce/blob/v8.6.6/doc/install/installation.md
#
# TODO
# - [timfel-krb5-auth] doesn't build with heimdal (https://github.com/timfel/krb5-auth/issues/8)
@@ -17,7 +17,7 @@
Summary: A Web interface to create projects and repositories, manage access and do code reviews
Name: gitlab-ce
Version: 8.6.6
-Release: 0.1
+Release: 0.2
License: MIT
Group: Applications/WWW
# md5 deliberately omitted until this package is useful
@@ -41,6 +41,8 @@ Suggests: mysql
Suggests: redis-server
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _noautoreqfiles redcloth_scan.jar primitives.jar
+
%define gitlab_uid 65434
%define gitlab_gid 65434
@@ -81,6 +83,9 @@ bundle install %{_smp_mflags} \
%{?debug:--no-cache --no-prune} \
--deployment --without development test aws %{!?with_krb5:kerberos}
+# avoid bogus ruby dep
+chmod a-x vendor/bundle/ruby/gems/unicorn-*/bin/unicorn*
+
%install
rm -rf $RPM_BUILD_ROOT
install -d \
@@ -165,6 +170,8 @@ fi
%config(noreplace) %{_sysconfdir}/gitlab/database.yml
%config(noreplace) %{_sysconfdir}/gitlab/gitlab.yml
%config(noreplace) %{_sysconfdir}/gitlab/unicorn.rb
+%dir /etc/httpd
+%dir /etc/httpd/httpd.d
%config(noreplace) %{_sysconfdir}/httpd/httpd.d/gitlab.conf
/etc/logrotate.d/gitlab.logrotate
%{systemdunitdir}/gitlab-sidekiq.service
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/a92c651e20f227b6404db5793ed26fbcb577e1f8
More information about the pld-cvs-commit
mailing list