[packages/gitlab-ce] cleanup gem test in clean script; sorted

glen glen at pld-linux.org
Tue Aug 30 08:20:15 CEST 2016


commit f32d6ba16495a086884d28e1681bc408ec87ee20
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Aug 30 09:19:37 2016 +0300

    cleanup gem test in clean script; sorted

 clean-vendor.sh | 15 ++++++++-------
 gitlab-ce.spec  |  6 +-----
 2 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 3362082..801fca1 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.11.3
-Release:	0.67
+Release:	0.68
 License:	MIT
 Group:		Applications/WWW
 # md5 deliberately omitted until this package is useful
@@ -179,10 +179,6 @@ mv $RPM_BUILD_ROOT%{homedir}/vendor/bundle/ruby/gems/rugged-{$v,$ov}
 # rpm cruft from repackaging
 rm -f $RPM_BUILD_ROOT%{homedir}/debug*.list
 
-# nuke tests
-chmod -R u+w $RPM_BUILD_ROOT%{homedir}/vendor/bundle/ruby/gems/*/test
-rm -r $RPM_BUILD_ROOT%{homedir}/vendor/bundle/ruby/gems/*/test
-
 # Creating links
 rmdir $RPM_BUILD_ROOT%{homedir}/{log,tmp/{pids,sockets}}
 ln -s %{_localstatedir}/run/gitlab $RPM_BUILD_ROOT%{homedir}/tmp/pids
diff --git a/clean-vendor.sh b/clean-vendor.sh
index 8484c11..805a542 100755
--- a/clean-vendor.sh
+++ b/clean-vendor.sh
@@ -57,9 +57,13 @@ clean_rubygems() {
 	rm -fv gems/*/*.rdoc
 	rm -fv gems/*/*.sh
 	rm -fv gems/*/*.txt
+	rm -fv gems/*/*LICENSE*
+	rm -fv gems/*/CHANGES*
 	rm -fv gems/*/Gemfile
 	rm -fv gems/*/Guardfile
+	rm -fv gems/*/README*
 	rm -fv gems/*/Rakefile
+	rm -fv gems/*/run_tests.rb
 	rm -rfv gems/*/Documentation
 	rm -rfv gems/*/bench
 	rm -rfv gems/*/contrib
@@ -67,19 +71,16 @@ clean_rubygems() {
 	rm -rfv gems/*/doc-api
 	rm -rfv gems/*/examples
 	rm -rfv gems/*/ext
+	rm -rfv gems/*/fixtures
 	rm -rfv gems/*/gemfiles
 	rm -rfv gems/*/libtest
 	rm -rfv gems/*/man
+	rm -rfv gems/*/sample_documents
+	rm -rfv gems/*/samples
 	rm -rfv gems/*/script
 	rm -rfv gems/*/t
+	rm -rfv gems/*/test
 	rm -rfv gems/*/tests
-	rm -rfv gems/*/sample_documents
-	rm -rfv gems/*/fixtures
-	rm -rfv gems/*/samples
-	rm -fv gems/*/run_tests.rb
-	rm -fv gems/*/*LICENSE*
-	rm -fv gems/*/CHANGES*
-	rm -fv gems/*/README*
 
 	# clean selected vendor, because:
 	# LoadError: cannot load such file -- dependency_detection
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list