cleanup gem test in clean script; sorted

diff --git a/clean-vendor.sh b/clean-vendor.sh
index 8484c118e03888599311800ff6906f8b38926492..805a542bcd8a7c7f620e892d6a24e2f68cdee44a 100755 (executable)
--- 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

diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 33620822aafa0298263607167874488f4ec5eb38..801fca10d64e106c6937f4432e6c9a09d017ea0b 100644 (file)
--- 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