up to ruby-2.1.7

[packages/ruby.git] / ruby.spec

diff --git a/ruby.spec b/ruby.spec
index 3f23759d0d9d72bc03b81a1945e203c5b10da4df..1949b611128ce6738d84aab9a734ef03bfecbd82 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -11,10 +11,10 @@
 %bcond_with    bootstrap       # build bootstrap version
 %bcond_with    tests           # build without tests
 
-%define                rel             0.2
+%define                rel             1
 %define                ruby_version    2.1
 %define                basever         2.1
-%define                patchlevel      6
+%define                patchlevel      7
 
 %define                ruby_suffix %{!?with_default_ruby:%{ruby_version}}
 %define                doc_version     2_1_0
@@ -45,7 +45,7 @@ License:      (Ruby or BSD) and Public Domain
 Group:         Development/Languages
 # https://www.ruby-lang.org/en/downloads/
 Source0:       https://ftp.ruby-lang.org/pub/ruby/2.1/%{oname}-%{basever}.%{patchlevel}.tar.xz
-# Source0-md5: ec6f10ca331ce947802ede86259513a8
+# Source0-md5: 2e43a1d32cc16975a6b5d3ffce399199
 Source1:       http://www.ruby-doc.org/download/%{oname}-doc-bundle.tar.gz
 # Source1-md5: ad1af0043be98ba1a4f6d0185df63876
 Source2:       http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
@@ -489,6 +489,10 @@ cd ..
 %endif
 
 %if %{with tests}
+# unset these, as testsuite does "git commit" somewhere, which points to pld .spec repo. doh
+unset GIT_DIR GIT_WORK_TREE
+
+unset GIT
 DISABLE_TESTS=""
 
 %ifarch armv7l armv7hl armv7hnl
@@ -547,7 +551,7 @@ for cert in \
        DigiCertHighAssuranceEVRootCA.pem \
        EntrustnetSecureServerCertificationAuthority.pem \
        GeoTrustGlobalCA.pem \
-do
+; do
        %{__rm} $RPM_BUILD_ROOT%{rubygems_dir}/rubygems/ssl_certs/$cert
 done