solve deps for install

diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index dbcd9f8b78205d4b5e27dde1d48df3b8c14a8c33..ecbec4b0d31a9e51ad70910f9dd04156150415f1 100644 (file)
--- 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