Compare commits
19 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
22ddfc8f11 | ||
|
|
a0377b1ffd | ||
|
|
90cd529668 | ||
|
|
fa57346f58 | ||
|
|
1e04690321 | ||
|
|
2eaad8232d | ||
|
|
75b09f7e8d | ||
|
|
9e44781e77 | ||
|
|
919ffce26d | ||
|
|
7c8c132498 | ||
|
|
6513316579 | ||
|
|
42aa79b591 | ||
|
|
db598b5391 | ||
|
|
bedc1b6cdd | ||
|
|
107d894245 | ||
|
|
b596581271 | ||
|
|
0cd757ceed | ||
|
|
58141e4182 | ||
|
|
0847d7265b |
13 changed files with 221 additions and 41 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -1,2 +1,7 @@
|
|||
/ruby-2.*.tar.bz2
|
||||
/ruby-2.2.0.tar.xz
|
||||
/ruby-2.2.1.tar.xz
|
||||
/ruby-2.2.2.tar.xz
|
||||
/ruby-2.2.3.tar.xz
|
||||
/ruby-2.2.4.tar.xz
|
||||
/ruby-2.2.5.tar.xz
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ diff --git a/lib/mkmf.rb b/lib/mkmf.rb
|
|||
index 682eb46..e6b1445 100644
|
||||
--- a/lib/mkmf.rb
|
||||
+++ b/lib/mkmf.rb
|
||||
@@ -1858,7 +1858,7 @@ SRC
|
||||
@@ -1859,7 +1859,7 @@ SRC
|
||||
SHELL = /bin/sh
|
||||
|
||||
# V=0 quiet, V=1 verbose. other values don't work.
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ diff --git a/common.mk b/common.mk
|
|||
index 5cfbc3d..3f0a82e 100644
|
||||
--- a/common.mk
|
||||
+++ b/common.mk
|
||||
@@ -115,7 +115,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS)
|
||||
@@ -117,7 +117,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS)
|
||||
GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
|
||||
|
||||
DEFAULT_PRELUDES = $(GEM_PRELUDE)
|
||||
|
|
@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in
|
|||
index 0e371e2..d4f1dcb 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -4160,6 +4160,13 @@ AC_SUBST(rubyarchhdrdir)dnl
|
||||
@@ -4209,6 +4209,13 @@ AC_SUBST(rubyarchhdrdir)dnl
|
||||
AC_SUBST(sitearchhdrdir)dnl
|
||||
AC_SUBST(vendorarchhdrdir)dnl
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
|
|||
index 37d9a62..553d4d0 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -3379,6 +3379,11 @@ if test ${multiarch+set}; then
|
||||
@@ -3425,6 +3425,11 @@ if test ${multiarch+set}; then
|
||||
fi
|
||||
|
||||
archlibdir='${libdir}/${arch}'
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in
|
|||
index 17ed3ed..5843651 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -3966,8 +3966,6 @@ AS_CASE(["$target_os"],
|
||||
@@ -4015,8 +4015,6 @@ AS_CASE(["$target_os"],
|
||||
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
|
||||
])
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ index 17ed3ed..5843651 100644
|
|||
|
||||
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
|
||||
AC_ARG_WITH(rubyarchprefix,
|
||||
@@ -3997,6 +3995,7 @@ AC_ARG_WITH(ruby-version,
|
||||
@@ -4046,6 +4044,7 @@ AC_ARG_WITH(ruby-version,
|
||||
[ruby_version=full])
|
||||
unset RUBY_LIB_VERSION
|
||||
unset RUBY_LIB_VERSION_STYLE
|
||||
|
|
@ -31,7 +31,7 @@ index 17ed3ed..5843651 100644
|
|||
AS_CASE(["$ruby_version"],
|
||||
[full], [RUBY_LIB_VERSION_STYLE='3 /* full */'],
|
||||
[minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */'])
|
||||
@@ -4013,30 +4012,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
|
||||
@@ -4062,30 +4061,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
|
||||
ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
|
||||
eval $ruby_version
|
||||
elif test -z "${ruby_version}"; then
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
|
|||
index 553d4d0..03a4152 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -4078,6 +4078,8 @@ AC_SUBST(vendorarchdir)dnl
|
||||
@@ -4127,6 +4127,8 @@ AC_SUBST(vendorarchdir)dnl
|
||||
|
||||
AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in
|
|||
index 03a4152..0e371e2 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -4052,6 +4052,10 @@ AC_ARG_WITH(vendorarchdir,
|
||||
@@ -4101,6 +4101,10 @@ AC_ARG_WITH(vendorarchdir,
|
||||
[vendorarchdir=$withval],
|
||||
[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644
|
|||
if test "${LOAD_RELATIVE+set}"; then
|
||||
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
||||
RUBY_EXEC_PREFIX=''
|
||||
@@ -4075,6 +4079,7 @@ AC_SUBST(sitearchdir)dnl
|
||||
@@ -4124,6 +4128,7 @@ AC_SUBST(sitearchdir)dnl
|
||||
AC_SUBST(vendordir)dnl
|
||||
AC_SUBST(vendorlibdir)dnl
|
||||
AC_SUBST(vendorarchdir)dnl
|
||||
|
|
|
|||
28
ruby-2.2.3-Generate-preludes-using-miniruby.patch
Normal file
28
ruby-2.2.3-Generate-preludes-using-miniruby.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
From 9fedac991e717f0103d092275ac301e58c5cf010 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
||||
Date: Tue, 2 Dec 2014 10:56:58 +0100
|
||||
Subject: [PATCH] Generate preludes using miniruby.
|
||||
|
||||
---
|
||||
common.mk | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/common.mk b/common.mk
|
||||
index 76f1621..b0f6e28 100644
|
||||
--- a/common.mk
|
||||
+++ b/common.mk
|
||||
@@ -782,9 +782,9 @@ $(PRELUDE_C): $(COMPILE_PRELUDE) \
|
||||
$(PRELUDE_C): $(COMPILE_PRELUDE) \
|
||||
{$(srcdir)}lib/rubygems/defaults.rb \
|
||||
{$(srcdir)}lib/rubygems/core_ext/kernel_gem.rb \
|
||||
- $(PRELUDE_SCRIPTS) $(LIB_SRCS)
|
||||
+ $(PRELUDE_SCRIPTS) $(PREP) $(LIB_SRCS)
|
||||
$(ECHO) generating $@
|
||||
- $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
|
||||
+ $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
|
||||
$(srcdir)/template/prelude.c.tmpl $(PRELUDE_SCRIPTS)
|
||||
|
||||
{$(VPATH)}golf_prelude.c: $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
From cf23ad429da3213fd3b1261c546dfa08e7dba2bf Mon Sep 17 00:00:00 2001
|
||||
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
|
||||
Date: Wed, 27 Apr 2016 13:17:50 +0000
|
||||
Subject: [PATCH] * compile.c (new_label_body): missed backporting r54548 in
|
||||
r54698. this fixes randomly test failure introduced by r54698. cf. [Bug
|
||||
#12082]
|
||||
|
||||
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
||||
---
|
||||
ChangeLog | 6 ++++++
|
||||
compile.c | 2 ++
|
||||
2 files changed, 8 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index 2cfdb2c2..fe09b1e 100644
|
||||
--- a/ChangeLog
|
||||
+++ b/ChangeLog
|
||||
@@ -1,3 +1,9 @@
|
||||
+Wed Apr 27 22:16:04 2016 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
+
|
||||
+ * compile.c (new_label_body): missed backporting r54548 in r54698.
|
||||
+ this fixes randomly test failure introduced by r54698.
|
||||
+ cf. [Bug #12082]
|
||||
+
|
||||
Fri Apr 29 20:11:38 2016 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* test/ruby/test_time_tz.rb: Tests depends on Europe/Moscow removed
|
||||
diff --git a/compile.c b/compile.c
|
||||
index 001152a..cc8e748 100644
|
||||
--- a/compile.c
|
||||
+++ b/compile.c
|
||||
@@ -929,6 +929,8 @@ new_label_body(rb_iseq_t *iseq, long line)
|
||||
labelobj->label_no = iseq->compile_data->label_no++;
|
||||
labelobj->sc_state = 0;
|
||||
labelobj->sp = -1;
|
||||
+ labelobj->set = 0;
|
||||
+ labelobj->rescued = LABEL_RESCUE_NONE;
|
||||
return labelobj;
|
||||
}
|
||||
|
||||
63
ruby-2.2.6-Tests-depends-on-Europe-Moscow-removed.patch
Normal file
63
ruby-2.2.6-Tests-depends-on-Europe-Moscow-removed.patch
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
From d16ff5c412b90b2766be97a5d3d689c5a18528d3 Mon Sep 17 00:00:00 2001
|
||||
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
|
||||
Date: Fri, 29 Apr 2016 11:12:17 +0000
|
||||
Subject: [PATCH] merge revision(s) 54706:
|
||||
|
||||
* test/ruby/test_time_tz.rb: Tests depends on Europe/Moscow removed
|
||||
to avoid test failures due to the tzdata change.
|
||||
https://github.com/eggert/tz/commit/8ee11a301cf173afb0c76e0315b9f9ec8ebb9d95
|
||||
Found by naruse.
|
||||
|
||||
|
||||
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
||||
---
|
||||
ChangeLog | 7 +++++++
|
||||
test/ruby/test_time_tz.rb | 13 -------------
|
||||
2 files changed, 7 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index fe09b1e..1351c74 100644
|
||||
--- a/ChangeLog
|
||||
+++ b/ChangeLog
|
||||
@@ -1,3 +1,10 @@
|
||||
+Fri Apr 29 20:11:38 2016 Tanaka Akira <akr@fsij.org>
|
||||
+
|
||||
+ * test/ruby/test_time_tz.rb: Tests depends on Europe/Moscow removed
|
||||
+ to avoid test failures due to the tzdata change.
|
||||
+ https://github.com/eggert/tz/commit/8ee11a301cf173afb0c76e0315b9f9ec8ebb9d95
|
||||
+ Found by naruse.
|
||||
+
|
||||
Tue Apr 26 13:38:31 2016 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* README.EXT{,.ja}: `nul` should be uppercase.
|
||||
diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb
|
||||
index fb1ab9b..96a03b7 100644
|
||||
--- a/test/ruby/test_time_tz.rb
|
||||
+++ b/test/ruby/test_time_tz.rb
|
||||
@@ -169,13 +169,6 @@ def test_europe_lisbon
|
||||
}
|
||||
end if has_lisbon_tz
|
||||
|
||||
- def test_europe_moscow
|
||||
- with_tz(tz="Europe/Moscow") {
|
||||
- assert_time_constructor(tz, "1992-03-29 00:00:00 +0400", :local, [1992,3,28,23,0,0])
|
||||
- assert_time_constructor(tz, "1992-03-29 00:59:59 +0400", :local, [1992,3,28,23,59,59])
|
||||
- }
|
||||
- end
|
||||
-
|
||||
def test_pacific_kiritimati
|
||||
with_tz(tz="Pacific/Kiritimati") {
|
||||
assert_time_constructor(tz, "1994-12-31 23:59:59 -1000", :local, [1994,12,31,23,59,59])
|
||||
@@ -355,12 +348,6 @@ def self.gen_zdump_test(data)
|
||||
Europe/London Sun Aug 10 01:00:00 1947 UTC = Sun Aug 10 02:00:00 1947 BST isdst=1 gmtoff=3600
|
||||
Europe/London Sun Nov 2 01:59:59 1947 UTC = Sun Nov 2 02:59:59 1947 BST isdst=1 gmtoff=3600
|
||||
Europe/London Sun Nov 2 02:00:00 1947 UTC = Sun Nov 2 02:00:00 1947 GMT isdst=0 gmtoff=0
|
||||
-Europe/Moscow Sat Jan 18 23:59:59 1992 UTC = Sun Jan 19 01:59:59 1992 MSK isdst=0 gmtoff=7200
|
||||
-Europe/Moscow Sun Jan 19 00:00:00 1992 UTC = Sun Jan 19 03:00:00 1992 MSK isdst=0 gmtoff=10800
|
||||
-Europe/Moscow Sat Mar 28 19:59:59 1992 UTC = Sat Mar 28 22:59:59 1992 MSK isdst=0 gmtoff=10800
|
||||
-Europe/Moscow Sat Mar 28 20:00:00 1992 UTC = Sun Mar 29 00:00:00 1992 MSD isdst=1 gmtoff=14400
|
||||
-Europe/Moscow Sat Sep 26 18:59:59 1992 UTC = Sat Sep 26 22:59:59 1992 MSD isdst=1 gmtoff=14400
|
||||
-Europe/Moscow Sat Sep 26 19:00:00 1992 UTC = Sat Sep 26 22:00:00 1992 MSK isdst=0 gmtoff=10800
|
||||
Pacific/Kiritimati Sun Jan 1 09:59:59 1995 UTC = Sat Dec 31 23:59:59 1994 LINT isdst=0 gmtoff=-36000
|
||||
Pacific/Kiritimati Sun Jan 1 10:00:00 1995 UTC = Mon Jan 2 00:00:00 1995 LINT isdst=0 gmtoff=50400
|
||||
End
|
||||
97
ruby.spec
97
ruby.spec
|
|
@ -1,6 +1,6 @@
|
|||
%global major_version 2
|
||||
%global minor_version 2
|
||||
%global teeny_version 0
|
||||
%global teeny_version 5
|
||||
%global major_minor_version %{major_version}.%{minor_version}
|
||||
|
||||
%global ruby_version %{major_minor_version}.%{teeny_version}
|
||||
|
|
@ -21,10 +21,10 @@
|
|||
%endif
|
||||
|
||||
|
||||
%global release 7
|
||||
%global release 48
|
||||
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
|
||||
|
||||
%global rubygems_version 2.4.5
|
||||
%global rubygems_version 2.4.5.1
|
||||
|
||||
# The RubyGems library has to stay out of Ruby directory three, since the
|
||||
# RubyGems should be share by all Ruby implementations.
|
||||
|
|
@ -61,8 +61,11 @@ Name: ruby
|
|||
Version: %{ruby_version}
|
||||
Release: %{release_string}
|
||||
Group: Development/Languages
|
||||
# Public Domain for example for: include/ruby/st.h, strftime.c, ...
|
||||
License: (Ruby or BSD) and Public Domain
|
||||
# Public Domain for example for: include/ruby/st.h, strftime.c, missing/*, ...
|
||||
# MIT and CCO: ccan/*
|
||||
# zlib: ext/digest/md5/md5.*, ext/nkf/nkf-utf8/nkf.c
|
||||
# UCD: some of enc/trans/**/*.src
|
||||
License: (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD
|
||||
URL: http://ruby-lang.org/
|
||||
Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{major_minor_version}/%{ruby_archive}.tar.xz
|
||||
Source1: operating_system.rb
|
||||
|
|
@ -83,6 +86,8 @@ Source9: rubygems.req
|
|||
Source10: rubygems.prov
|
||||
# SystemTap sanity test case.
|
||||
Source11: test_systemtap.rb
|
||||
# ABRT hoook test case.
|
||||
Source12: test_abrt.rb
|
||||
|
||||
# The load directive is supported since RPM 4.12, i.e. F21+. The build process
|
||||
# fails on older Fedoras.
|
||||
|
|
@ -107,6 +112,16 @@ Patch5: ruby-1.9.3-mkmf-verbose.patch
|
|||
# in support for ABRT.
|
||||
# http://bugs.ruby-lang.org/issues/8566
|
||||
Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
|
||||
# Use miniruby to regenerate prelude.c.
|
||||
# https://bugs.ruby-lang.org/issues/10554
|
||||
Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch
|
||||
# Ignore Europe/Moscow TZ test, which fails due to change in tzdata.
|
||||
# https://github.com/ruby/ruby/commit/d16ff5c412b90b2766be97a5d3d689c5a18528d3
|
||||
Patch8: ruby-2.2.6-Tests-depends-on-Europe-Moscow-removed.patch
|
||||
# Fixes random TestRubyOptimization#test_tailcall_inhibited_by_rescue test
|
||||
# suite failures.
|
||||
# https://github.com/ruby/ruby/commit/cf23ad429da3213fd3b1261c546dfa08e7dba2bf
|
||||
Patch9: ruby-2.2.6-Fix-random-test-failure-introduced-by-r54698.patch
|
||||
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
Requires: ruby(rubygems) >= %{rubygems_version}
|
||||
|
|
@ -198,7 +213,7 @@ Macros and development tools for packaging RubyGems.
|
|||
Summary: Ruby based make-like utility
|
||||
Version: %{rake_version}
|
||||
Group: Development/Libraries
|
||||
License: Ruby or MIT
|
||||
License: MIT
|
||||
Requires: ruby(release)
|
||||
Requires: ruby(rubygems) >= %{rubygems_version}
|
||||
Provides: rake = %{version}-%{release}
|
||||
|
|
@ -228,7 +243,8 @@ from the terminal.
|
|||
Summary: A tool to generate HTML and command-line documentation for Ruby projects
|
||||
Version: %{rdoc_version}
|
||||
Group: Development/Libraries
|
||||
License: GPLv2 and Ruby and MIT
|
||||
# SIL: lib/rdoc/generator/template/darkfish/css/fonts.css
|
||||
License: GPLv2 and Ruby and MIT and SIL
|
||||
Requires: ruby(release)
|
||||
Requires: ruby(rubygems) >= %{rubygems_version}
|
||||
Requires: ruby(irb) = %{irb_version}
|
||||
|
|
@ -293,7 +309,8 @@ provide higher layer features, such like curses and readline.
|
|||
Summary: This is a JSON implementation as a Ruby extension in C
|
||||
Version: %{json_version}
|
||||
Group: Development/Libraries
|
||||
License: Ruby or GPLv2
|
||||
# UCD: ext/json/generator/generator.c
|
||||
License: (Ruby or GPLv2) and UCD
|
||||
Requires: ruby(release)
|
||||
Requires: ruby(rubygems) >= %{rubygems_version}
|
||||
Provides: rubygem(json) = %{version}-%{release}
|
||||
|
|
@ -405,6 +422,9 @@ rm -rf ext/fiddle/libffi*
|
|||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
|
||||
# Provide an example of usage of the tapset:
|
||||
cp -a %{SOURCE3} .
|
||||
|
|
@ -431,17 +451,12 @@ autoconf
|
|||
--with-vendorarchhdrdir='$(vendorhdrdir)/$(arch)' \
|
||||
--with-rubygemsdir='%{rubygems_dir}' \
|
||||
--with-ruby-pc='%{name}.pc' \
|
||||
--with-tcltkversion=8.6 \
|
||||
--disable-rpath \
|
||||
--enable-shared \
|
||||
--with-ruby-version='' \
|
||||
--enable-multiarch \
|
||||
--with-prelude=./abrt_prelude.rb \
|
||||
|
||||
# Avoid regeneration of prelude.c due to patch6 applied to common.mk.
|
||||
# https://bugs.ruby-lang.org/issues/10554
|
||||
touch prelude.c
|
||||
|
||||
# Q= makes the build output more verbose and allows to check Fedora
|
||||
# compiler options.
|
||||
make %{?_smp_mflags} COPY="cp -p" Q=
|
||||
|
|
@ -573,32 +588,24 @@ done
|
|||
|
||||
# Install a tapset and fix up the path to the library.
|
||||
mkdir -p %{buildroot}%{tapset_dir}
|
||||
sed -e "s|@LIBRARY_PATH@|%{tapset_libdir}/libruby.so.%{ruby_version}|" \
|
||||
%{SOURCE2} > %{buildroot}%{tapset_dir}/libruby.so.%{ruby_version}.stp
|
||||
sed -e "s|@LIBRARY_PATH@|%{tapset_libdir}/libruby.so.%{major_minor_version}|" \
|
||||
%{SOURCE2} > %{buildroot}%{tapset_dir}/libruby.so.%{major_minor_version}.stp
|
||||
# Escape '*/' in comment.
|
||||
sed -i -r "s|( \*.*\*)\/(.*)|\1\\\/\2|" %{buildroot}%{tapset_dir}/libruby.so.%{ruby_version}.stp
|
||||
sed -i -r "s|( \*.*\*)\/(.*)|\1\\\/\2|" %{buildroot}%{tapset_dir}/libruby.so.%{major_minor_version}.stp
|
||||
|
||||
%check
|
||||
# Sanity check that SystemTap (dtrace) was detected.
|
||||
make runruby TESTRUN_SCRIPT=%{SOURCE11}
|
||||
|
||||
DISABLE_TESTS=""
|
||||
|
||||
# test_debug(TestRubyOptions) fails due to LoadError reported in debug mode,
|
||||
# when abrt.rb cannot be required (seems to be easier way then customizing
|
||||
# the test suite).
|
||||
touch abrt.rb
|
||||
|
||||
# Don't test wrap ciphers to prevent "OpenSSL::Cipher::CipherError: wrap mode
|
||||
# not allowed" error.
|
||||
# https://bugs.ruby-lang.org/issues/10229
|
||||
sed -i '/assert(OpenSSL::Cipher::Cipher.new(name).is_a?(OpenSSL::Cipher::Cipher))/i \
|
||||
next if /wrap/ =~ name' test/openssl/test_cipher.rb
|
||||
# Sanity check that SystemTap (dtrace) was detected.
|
||||
make runruby TESTRUN_SCRIPT=%{SOURCE11}
|
||||
|
||||
# Test is broken due to SSLv3 disabled in Fedora.
|
||||
# https://bugs.ruby-lang.org/issues/10046
|
||||
sed -i '/def test_ctx_client_session_cb$/,/^ end$/ s/^/#/' test/openssl/test_ssl_session.rb
|
||||
sed -i '/def test_ctx_server_session_cb$/,/^ end$/ s/^/#/' test/openssl/test_ssl_session.rb
|
||||
# Check if abrt hook is required.
|
||||
make runruby TESTRUN_SCRIPT=%{SOURCE12}
|
||||
|
||||
DISABLE_TESTS=""
|
||||
|
||||
make check TESTS="-v $DISABLE_TESTS"
|
||||
|
||||
|
|
@ -752,7 +759,9 @@ make check TESTS="-v $DISABLE_TESTS"
|
|||
%{ruby_libarchdir}/enc/utf_16le.so
|
||||
%{ruby_libarchdir}/enc/utf_32be.so
|
||||
%{ruby_libarchdir}/enc/utf_32le.so
|
||||
%{ruby_libarchdir}/enc/windows_1250.so
|
||||
%{ruby_libarchdir}/enc/windows_1251.so
|
||||
%{ruby_libarchdir}/enc/windows_1252.so
|
||||
%{ruby_libarchdir}/enc/windows_31j.so
|
||||
%{ruby_libarchdir}/etc.so
|
||||
%{ruby_libarchdir}/fcntl.so
|
||||
|
|
@ -892,6 +901,34 @@ make check TESTS="-v $DISABLE_TESTS"
|
|||
%{ruby_libdir}/tkextlib
|
||||
|
||||
%changelog
|
||||
* Mon May 02 2016 Vít Ondruch <vondruch@redhat.com> - 2.2.5-48
|
||||
- Update to Ruby 2.2.5.
|
||||
|
||||
* Mon Dec 21 2015 Vít Ondruch <vondruch@redhat.com> - 2.2.4-47
|
||||
- Update to Ruby 2.2.4.
|
||||
|
||||
* Thu Dec 10 2015 Vít Ondruch <vondruch@redhat.com> - 2.2.3-46
|
||||
- Fix ABRT hook autoloading.
|
||||
|
||||
* Tue Sep 01 2015 Vít Ondruch <vondruch@redhat.com> - 2.2.3-44
|
||||
- Update to Ruby 2.2.3.
|
||||
|
||||
* Mon May 04 2015 Vít Ondruch <vondruch@redhat.com> - 2.2.2-40
|
||||
- Fix upgrade path (rubygem-io-console's version was recently bumped in F21
|
||||
and makes the higher release to win).
|
||||
|
||||
* Tue Apr 14 2015 Josef Stribny <jstribny@redhat.com> - 2.2.2-11
|
||||
- Bump release because of gems
|
||||
|
||||
* Tue Apr 14 2015 Josef Stribny <jstribny@redhat.com> - 2.2.2-1
|
||||
- Update to Ruby 2.2.2
|
||||
|
||||
* Fri Mar 20 2015 Vít Ondruch <vondruch@redhat.com> - 2.2.1-10
|
||||
- Fix libruby.so versions in SystemTap scripts (rhbz#1202232).
|
||||
|
||||
* Wed Mar 04 2015 Vít Ondruch <vondruch@redhat.com> - 2.2.1-9
|
||||
- Update to Ruby 2.2.1.
|
||||
|
||||
* Thu Feb 05 2015 Vít Ondruch <vondruch@redhat.com> - 2.2.0-7
|
||||
- Fix directory ownership.
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
54b43c6c6c9dd4c4b08ceb03ad0ded7a ruby-2.2.0.tar.xz
|
||||
4b9506c37e908b5b17215b66b2760438 ruby-2.2.5.tar.xz
|
||||
|
|
|
|||
7
test_abrt.rb
Normal file
7
test_abrt.rb
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
if !!$LOADED_FEATURES.detect { |f| f =~ /abrt\.rb/ }
|
||||
exit true
|
||||
else
|
||||
puts 'ERROR: ABRT hook was not loaded.'
|
||||
|
||||
exit false
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue