[packages/gitlab-ce] install newer rugged for diff bug

[glen]

commit 9a13c81436abd7a3dff7a3a05ae4d1868c441c14
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Aug 19 00:12:53 2016 +0300

    install newer rugged for diff bug
    
    https://gitlab.com/gitlab-org/gitlab-ce/issues/14972

 bug-14972.patch | 26 --------------------------
 gitlab-ce.spec  | 17 ++++++++++++-----
 2 files changed, 12 insertions(+), 31 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 83eaed3..2bcede2 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -12,12 +12,12 @@
 #
 # Conditional build:
 %bcond_with	krb5		# build with kerberos support
-%bcond_without	gem_cache	# use local to speedup gem installation
+%bcond_without	gem_cache	# use local cache to speedup gem installation
 
 Summary:	A Web interface to create projects and repositories, manage access and do code reviews
 Name:		gitlab-ce
 Version:	8.10.6
-Release:	0.43
+Release:	0.46
 License:	MIT
 Group:		Applications/WWW
 # md5 deliberately omitted until this package is useful
@@ -36,7 +36,6 @@ Source11:	gitlab-ctl.sh
 Source12:	clean-vendor.sh
 Patch0:		3774.patch
 Patch1:		pld.patch
-Patch2:		bug-14972.patch
 URL:		https://www.gitlab.com/gitlab-ce/
 BuildRequires:	cmake
 BuildRequires:	gmp-devel
@@ -81,7 +80,6 @@ mv config/gitlab.yml.example config/gitlab.yml
 mv config/unicorn.rb.example config/unicorn.rb
 #%patch0 -p1
 %patch1 -p1
-#%patch2 -p1
 
 # use mysql for now
 mv config/database.yml.mysql config/database.yml
@@ -123,6 +121,15 @@ bundle install %{_smp_mflags} \
 	--deployment \
 	--without development test aws %{!?with_krb5:kerberos}
 
+# install newer rugged to fix diff view showing garbage
+# https://gitlab.com/gitlab-org/gitlab-ce/issues/14972
+v=0.25.0b6
+bundle exec gem install -v $v rugged --no-rdoc --no-ri
+# 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}
+
 # precompile assets
 # use modified config so it doesn't croak
 cp -p config/gitlab.yml{,.production}
@@ -210,7 +217,7 @@ install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/gitlab-rake
 install -p %{SOURCE11} $RPM_BUILD_ROOT%{_sbindir}/gitlab-ctl
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT
 
 %pre
 if [ "$1" = "2" ]; then
diff --git a/bug-14972.patch b/bug-14972.patch
deleted file mode 100644
index 7297c4a..0000000
--- a/bug-14972.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-
-pin newer rugged
-https://gitlab.com/gitlab-org/gitlab-ce/issues/14972
-
---- gitlabhq-8.8.1/Gemfile.lock~	2016-05-23 04:59:54.000000000 +0300
-+++ gitlabhq-8.8.1/Gemfile.lock	2016-05-25 19:17:33.860299743 +0300
-@@ -354,7 +354,7 @@
-       activesupport (~> 4.0)
-       charlock_holmes (~> 0.7.3)
-       github-linguist (~> 4.7.0)
--      rugged (~> 0.24.0)
-+      rugged (~> 0.25.0b3)
-     gitlab_meta (7.0)
-     gitlab_omniauth-ldap (1.2.1)
-       net-ldap (~> 0.9)
---- gitlabhq-8.8.1/Gemfile~	2016-05-23 04:59:54.000000000 +0300
-+++ gitlabhq-8.8.1/Gemfile	2016-05-26 00:46:10.646707081 +0300
-@@ -53,6 +53,8 @@
- # Extracting information from a git repository
- # Provide access to Gitlab::Git library
- gem "gitlab_git", '~> 10.0'
-+# Pin for https://gitlab.com/gitlab-org/gitlab-ce/issues/14972
-+gem "rugged", '~> 0.25.0b3'
- 
- # LDAP Auth
- # GitLab fork with several improvements to original library. For full list of changes
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/54f50e6d82f2e0867cf436bd691ddbbe00aa7c47