From 067f92da4f0624221d232669b8c6b66965623b54 Mon Sep 17 00:00:00 2001 From: wang--ge Date: Mon, 26 Sep 2022 10:21:28 +0800 Subject: [PATCH] add multi version branch for obs-server --- ruby.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ruby.spec b/ruby.spec index 9804bc4..386caa0 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ Name: ruby Version: 2.5.8 -Release: 117 +Release: 118 Summary: Object-oriented scripting language interpreter License: (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD URL: https://www.ruby-lang.org/ @@ -19,8 +19,8 @@ Source11: rubygems.con Source12: test_abrt.rb Source13: test_systemtap.rb -%{?load:%{SOURCE4}} -%{?load:%{SOURCE5}} +%{load:%{SOURCE4}} +%{load:%{SOURCE5}} Patch0001: ruby-2.3.0-ruby_version.patch Patch0002: ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -58,8 +58,8 @@ Suggests: rubypick Recommends: ruby(rubygems) >= 2.7.6 rubygem(bigdecimal) >= 1.3.4 Recommends: rubygem(did_you_mean) >= 1.2.0 rubygem(openssl) >= 2.1.0 Requires: %{name}-help = %{version}-%{release} -BuildRequires: autoconf gdbm-devel gmp-devel libffi-devel openssl-devel libyaml-devel readline-devel -BuildRequires: procps git gcc systemtap-sdt-devel cmake elfutils-extra +BuildRequires: autoconf <= 2.70 gdbm-devel gmp-devel libffi-devel openssl-devel libyaml-devel readline-devel +BuildRequires: procps git gcc systemtap-sdt-devel cmake %description Ruby is a fast and easy interpreted scripting language for object-oriented programming. @@ -583,6 +583,9 @@ make runruby TESTRUN_SCRIPT=%{SOURCE13} %exclude %{gem_dir}/gems/xmlrpc-0.3.0/.* %changelog +* Mon Sep 26 2022 Ge Wang - 2.5.8-118 +- add multi version branch for obs-server + * Thu Sep 22 2022 shixuantong - 2.5.8-117 - fix build failure caused by command eu-readelf not found @@ -610,7 +613,7 @@ make runruby TESTRUN_SCRIPT=%{SOURCE13} - SUG:NA - DESC:change release number for rebuild -* Thu Nov 9 2020 wutao - 2.5.8-3 +* Thu Nov 5 2020 wutao - 2.5.8-3 - fix CVE-2020-25613 - WEBrick,a simple HTTP server bundled with Ruby,had not - checked the transfer-encoding header value rigorously. -- Gitee