[packages/gitlab-ce] do rugged hack in install
glen
glen at pld-linux.org
Fri Aug 19 09:03:36 CEST 2016
commit c5b62b37ebe08a5bf2fde3457c46488ba611c647
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Aug 19 08:37:51 2016 +0300
do rugged hack in install
so it doesn't mess up the cache
gitlab-ce.spec | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 1b03553..6d5a80f 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -17,7 +17,7 @@
Summary: A Web interface to create projects and repositories, manage access and do code reviews
Name: gitlab-ce
Version: 8.10.6
-Release: 0.47
+Release: 0.48
License: MIT
Group: Applications/WWW
# md5 deliberately omitted until this package is useful
@@ -125,12 +125,6 @@ bundle install %{_smp_mflags} \
# https://gitlab.com/gitlab-org/gitlab-ce/issues/14972
v=0.25.0b6
bundle exec gem install -v $v rugged --no-rdoc --no-ri --verbose
-# replace the contents, yet leave it believe it has proper version installed (for gem dependencies)
-ov=0.24.0
-rm -r vendor/bundle/ruby/extensions/%{_arch}-linux/rugged-$ov
-mv vendor/bundle/ruby/extensions/%{_arch}-linux/rugged-{$v,$ov}
-rm -r vendor/bundle/ruby/gems/rugged-$ov
-mv vendor/bundle/ruby/gems/rugged-{$v,$ov}
# precompile assets
# use modified config so it doesn't croak
@@ -177,6 +171,14 @@ cp -a$l . $RPM_BUILD_ROOT%{homedir}
# cleanup unneccessary cruft (gem build files, etc)
sh -x %{SOURCE12} $RPM_BUILD_ROOT%{homedir}
+# replace the contents, yet leave it believe it has proper version installed (for gem dependencies)
+v=0.25.0b6
+ov=0.24.0
+rm -r $RPM_BUILD_ROOT%{homedir}/vendor/bundle/ruby/extensions/%{_arch}-linux/rugged-$ov
+mv $RPM_BUILD_ROOT%{homedir}/vendor/bundle/ruby/extensions/%{_arch}-linux/rugged-{$v,$ov}
+rm -r $RPM_BUILD_ROOT%{homedir}/vendor/bundle/ruby/gems/rugged-$ov
+mv $RPM_BUILD_ROOT%{homedir}/vendor/bundle/ruby/gems/rugged-{$v,$ov}
+
# rpm cruft from repackaging
rm -f $RPM_BUILD_ROOT%{homedir}/debug*.list
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/54f50e6d82f2e0867cf436bd691ddbbe00aa7c47
More information about the pld-cvs-commit
mailing list