[packages/setup.rb] handle Config drop in Ruby 2.3

glen glen at pld-linux.org
Thu Oct 26 19:22:39 CEST 2017


commit ec8d94c332ee6164be29166713085ca15cc01fac
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Thu Oct 26 20:22:16 2017 +0300

    handle Config drop in Ruby 2.3
    
    RbConfig is new symbol

 rbconfig-deprecation.patch | 11 +++++++++++
 setup.rb.spec              |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/setup.rb.spec b/setup.rb.spec
index 68b49fc..3e35784 100644
--- a/setup.rb.spec
+++ b/setup.rb.spec
@@ -2,12 +2,13 @@ Summary:	setup.rb - a generic installer for Ruby scripts
 Summary(pl.UTF-8):	setup.rb - ogólny instalator dla skryptów języka Ruby
 Name:		setup.rb
 Version:	3.4.1
-Release:	5
+Release:	6
 License:	LGPL v2.1
 Group:		Development/Tools
 Source0:	http://i.loveruby.net/archive/setup/setup-%{version}.tar.gz
 # Source0-md5:	f0759ec72473e5802d9571df4da6642c
-URL:		http://i.loveruby.net/en/prog/setup.html
+Patch0:		rbconfig-deprecation.patch
+URL:		http://i.loveruby.net/en/projects/setup/
 BuildRequires:	rpmbuild(macros) >= 1.665
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -20,6 +21,7 @@ setup.rb to ogólny instalator dla skryptów języka Ruby.
 
 %prep
 %setup -q -n setup-%{version}
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/rbconfig-deprecation.patch b/rbconfig-deprecation.patch
new file mode 100644
index 0000000..54a6c4c
--- /dev/null
+++ b/rbconfig-deprecation.patch
@@ -0,0 +1,11 @@
+--- setup-3.4.1/setup.rb~	2005-11-20 13:54:27.000000000 +0200
++++ setup-3.4.1/setup.rb	2017-10-26 20:17:38.577633766 +0300
+@@ -785,7 +785,7 @@
+     else
+       require 'rbconfig'
+     end
+-    ::Config::CONFIG
++    ::RbConfig::CONFIG
+   end
+ 
+   def initialize(ardir_root, config)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/setup.rb.git/commitdiff/ec8d94c332ee6164be29166713085ca15cc01fac



More information about the pld-cvs-commit mailing list