[packages/ruby: 29/29] Merge branch 'dev-2.3'

glen glen at pld-linux.org
Sun Aug 13 17:13:35 CEST 2017


commit e52e77e84ded4fd260a49d1ddb952456956d6193
Merge: 5b31e22 73a515e
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sun Aug 13 17:59:26 2017 +0300

    Merge branch 'dev-2.3'
    
    2.1.x left on v2.1.x branch

 archlibdir.patch               |   2 +-
 custom-rubygems-location.patch |  30 ++--
 duplicated-paths.patch         |  64 +------
 mkmf-verbose.patch             |   2 +-
 operating_system.rb            |  62 +++++--
 ruby-ffs.patch                 |  10 --
 ruby-version.patch             | 300 +++++++++++++++++++++++++++++++
 ruby.spec                      | 396 ++++++++++++++++++++++++++++++-----------
 strip-ccache.patch             |  37 ++--
 9 files changed, 682 insertions(+), 221 deletions(-)
---
diff --cc ruby.spec
index 3520b43,8f8ad76..8307176
--- a/ruby.spec
+++ b/ruby.spec
@@@ -11,10 -11,10 +11,10 @@@
  %bcond_with	bootstrap	# build bootstrap version
  %bcond_with	tests		# build without tests
  
- %define		rel		2
- %define		ruby_version	2.1
- %define		basever		2.1
- %define		patchlevel	10
 -%define		rel		0.4
++%define		rel		1
+ %define		ruby_version	2.3
+ %define		basever		2.3
+ %define		patchlevel	4
  %define		pkg_version	%{basever}.%{patchlevel}
  
  %define		ruby_suffix %{!?with_default_ruby:%{ruby_version}}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/e52e77e84ded4fd260a49d1ddb952456956d6193



More information about the pld-cvs-commit mailing list