From 3f8d97df41c484b9d04059a3aab49974fadf6e70 Mon Sep 17 00:00:00 2001
From: John <mtasaka@fedoraproject.org>
Date: Jan 19 2015 05:02:54 +0000
Subject: Remove deprecated Config:: usage yet more


---

diff --git a/alexandria-0.6.8-rbconfig.patch b/alexandria-0.6.8-rbconfig.patch
deleted file mode 100644
index 32e2a46..0000000
--- a/alexandria-0.6.8-rbconfig.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up alexandria-0.6.8/util/rake/fileinstall.rb.fix alexandria-0.6.8/util/rake/fileinstall.rb
---- alexandria-0.6.8/util/rake/fileinstall.rb.fix	2012-03-23 12:15:39.827228029 -0400
-+++ alexandria-0.6.8/util/rake/fileinstall.rb	2012-03-23 12:16:01.774011895 -0400
-@@ -185,12 +185,12 @@ class FileInstallTask < Rake::TaskLib
-   private
- 
-   def calculate_ruby_dir
--    ruby_prefix = Config::CONFIG['prefix']
-+    ruby_prefix = RbConfig::CONFIG['prefix']
- 
-     if @install_to_rubylibdir
--      ruby_libdir = Config::CONFIG['rubylibdir']
-+      ruby_libdir = RbConfig::CONFIG['rubylibdir']
-     else
--      ruby_libdir = Config::CONFIG['sitelibdir']
-+      ruby_libdir = RbConfig::CONFIG['sitelibdir']
-     end
-     if ENV.has_key?('RUBYLIBDIR')
-       ruby_libdir = ENV['RUBYLIBDIR']
diff --git a/alexandria-0.6.9-rbconfig.patch b/alexandria-0.6.9-rbconfig.patch
new file mode 100644
index 0000000..f8288b1
--- /dev/null
+++ b/alexandria-0.6.9-rbconfig.patch
@@ -0,0 +1,30 @@
+diff -up alexandria-0.6.8/util/rake/fileinstall.rb.fix alexandria-0.6.8/util/rake/fileinstall.rb
+--- alexandria-0.6.8/util/rake/fileinstall.rb.fix	2012-03-23 12:15:39.827228029 -0400
++++ alexandria-0.6.8/util/rake/fileinstall.rb	2012-03-23 12:16:01.774011895 -0400
+@@ -185,12 +185,12 @@ class FileInstallTask < Rake::TaskLib
+   private
+ 
+   def calculate_ruby_dir
+-    ruby_prefix = Config::CONFIG['prefix']
++    ruby_prefix = RbConfig::CONFIG['prefix']
+ 
+     if @install_to_rubylibdir
+-      ruby_libdir = Config::CONFIG['rubylibdir']
++      ruby_libdir = RbConfig::CONFIG['rubylibdir']
+     else
+-      ruby_libdir = Config::CONFIG['sitelibdir']
++      ruby_libdir = RbConfig::CONFIG['sitelibdir']
+     end
+     if ENV.has_key?('RUBYLIBDIR')
+       ruby_libdir = ENV['RUBYLIBDIR']
+--- alexandria-0.6.9/lib/alexandria/ui/iconview_tooltips.rb.rbconfig	2011-11-19 23:47:12.000000000 +0900
++++ alexandria-0.6.9/lib/alexandria/ui/iconview_tooltips.rb	2015-01-19 13:58:03.414409764 +0900
+@@ -68,7 +68,7 @@
+   def workaround_safe_from_tooltip_crashes
+     begin
+       require 'rbconfig'
+-      arch_is_x86_64 = Config::CONFIG['arch'] =~ /x86_64/i
++      arch_is_x86_64 = RbConfig::CONFIG['arch'] =~ /x86_64/i
+       ruby_gnome2_atleast017 = false
+       if Gtk::BINDING_VERSION and Gtk::BINDING_VERSION.instance_of? Array
+         major, minor, micro = Gtk::BINDING_VERSION
diff --git a/alexandria.spec b/alexandria.spec
index 11d9b68..e2c4b72 100644
--- a/alexandria.spec
+++ b/alexandria.spec
@@ -8,14 +8,14 @@
 %undefine		minorver	
 %undefine		ifpre	
 
-%define		fedorarel	9
+%define		fedorarel	10
 %define		rel		%{?ifpre:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
 
 Name:		alexandria
 Version:	%{majorver}
-Release:	%{rel}%{?dist}.1
+Release:	%{rel}%{?dist}
 Summary:	Book collection manager
 
 Group:		Applications/Productivity
@@ -43,7 +43,7 @@ Patch3:		alexandria-0.6.6-dont_use_thread_when_adding_file_by_isdn.patch
 # Always require rubygems
 Patch11:	alexandria-0.6.8-always-require-rubygems.patch
 # Use RbConfig
-Patch12:	alexandria-0.6.8-rbconfig.patch
+Patch12:	alexandria-0.6.9-rbconfig.patch
 # Use rdoc
 # Well, seems not needed on 0.6.9
 # Patch13:	alexandria-0.6.8-rdoc.patch
@@ -285,6 +285,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Mon Jan 19 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.9-10
+- Remove deprecated Config:: usage yet more
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.9-9.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild