From 4fa8c25fb7a4c32f8e136bfc74a11fc2da1dab0c Mon Sep 17 00:00:00 2001
From: John <mtasaka@fedoraproject.org>
Date: Fri, 16 Jan 2015 16:07:30 +0900
Subject: [PATCH] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2

- Remove deprecated Config:: usage
---
 ...y-1.2-ruby22-remove-deprecated-usage.patch | 24 +++++++++++++++++++
 xchat-ruby.spec                               |  9 ++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 xchat-ruby-1.2-ruby22-remove-deprecated-usage.patch

diff --git a/xchat-ruby-1.2-ruby22-remove-deprecated-usage.patch b/xchat-ruby-1.2-ruby22-remove-deprecated-usage.patch
new file mode 100644
index 0000000..03c7e51
--- /dev/null
+++ b/xchat-ruby-1.2-ruby22-remove-deprecated-usage.patch
@@ -0,0 +1,24 @@
+--- xchat-ruby-1.2-src/src/Makefile.rbconfig	2015-01-16 15:59:36.154426689 +0900
++++ xchat-ruby-1.2-src/src/Makefile	2015-01-16 16:00:33.272758195 +0900
+@@ -4,7 +4,7 @@
+ 
+ OBJ=xchat-ruby.o
+ 
+-ARCHDIR=`$(RUBY) -rrbconfig -e "puts Config::CONFIG['archdir']"`
++ARCHDIR=`$(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['archdir']"`
+ 
+ XCHAT_RUBY=xchat-ruby
+ SO_FILE=$(XCHAT_RUBY).so
+--- xchat-ruby-1.2-src/src/win32/make.rb.rbconfig	2007-04-26 20:16:32.000000000 +0900
++++ xchat-ruby-1.2-src/src/win32/make.rb	2015-01-16 16:00:45.426615950 +0900
+@@ -9,8 +9,8 @@
+ end
+ 
+ 
+-$archdir = Config::CONFIG['archdir']
+-$libs    = Config::CONFIG['LIBS']
++$archdir = RbConfig::CONFIG['archdir']
++$libs    = RbConfig::CONFIG['LIBS']
+ 
+ # first, process the header file
+ puts "Building 'xchat-ruby-plugin.h'..."
diff --git a/xchat-ruby.spec b/xchat-ruby.spec
index 024db17..beda8a0 100644
--- a/xchat-ruby.spec
+++ b/xchat-ruby.spec
@@ -1,6 +1,6 @@
 Name: xchat-ruby
 Version: 1.2
-Release: 20%{?dist}
+Release: 21%{?dist}
 Summary: An X-Chat plugin providing scripting functionality with Ruby
 
 Group: Applications/Internet
@@ -13,6 +13,8 @@ Patch0: xchat-ruby-global-rubyenv.patch
 Patch1: xchat-ruby-dont-ignore-cflags.patch
 Patch2: xchat-ruby-1.2-fix-null-ptr-deref.diff
 Patch3: xchat-ruby-1-2-ruby192-fix.diff
+# Remove deprecated usage on ruby 22
+Patch4: xchat-ruby-1.2-ruby22-remove-deprecated-usage.patch
 
 BuildRequires: ruby(release)
 BuildRequires: ruby-devel ruby
@@ -33,6 +35,7 @@ language in which to write X-Chat plugins.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -61,6 +64,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 16 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.2-21
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
+- Remove deprecated Config:: usage
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild