[postgresql-plruby] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
Mamoru TASAKA
mtasaka at fedoraproject.org
Fri Jan 16 17:31:28 UTC 2015
commit 485d0657a891913fc706231ecf9dbbae802eeb8d
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Sat Jan 17 02:31:49 2015 +0900
Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
- Fix obsolete Config:: usage
postgresql-plruby-ruby22-rbconfig.patch | 139 +++++++++++++++++++++++++++++++
postgresql-plruby.spec | 8 ++-
2 files changed, 146 insertions(+), 1 deletions(-)
---
diff --git a/postgresql-plruby-ruby22-rbconfig.patch b/postgresql-plruby-ruby22-rbconfig.patch
new file mode 100644
index 0000000..c4f596b
--- /dev/null
+++ b/postgresql-plruby-ruby22-rbconfig.patch
@@ -0,0 +1,139 @@
+--- postgresql-plruby-0.5.4/extconf.rb.rbconfig 2015-01-17 02:16:39.379409665 +0900
++++ postgresql-plruby-0.5.4/extconf.rb 2015-01-17 02:21:42.793184523 +0900
+@@ -52,7 +52,7 @@
+
+
+ create function plruby#{suffix}_call_handler() returns #{opaque}
+- as '#{Config::CONFIG["sitearchdir"]}/plruby#{suffix}.#{CONFIG["DLEXT"]}'
++ as '#{RbConfig::CONFIG["sitearchdir"]}/plruby#{suffix}.#{RbConfig::CONFIG["DLEXT"]}'
+ language '#{language}';
+
+ create #{trusted} language 'plruby#{suffix}'
+@@ -190,7 +190,7 @@
+ orig_argv << "--with-cflags='#$CFLAGS -I.. -I ../..'"
+ orig_argv << "--with-ldflags='#$LDFLAGS'"
+ orig_argv << "--with-cppflags='#$CPPFLAGS'"
+- cmd = "#{CONFIG['RUBY_INSTALL_NAME']} extconf.rb #{orig_argv.join(' ')}"
++ cmd = "#{RbConfig::CONFIG['RUBY_INSTALL_NAME']} extconf.rb #{orig_argv.join(' ')}"
+ system("cd #{key}; #{cmd}")
+ end
+
+@@ -198,13 +198,13 @@
+
+ begin
+ Dir.chdir("src")
+- if CONFIG["ENABLE_SHARED"] == "no"
+- libs = if CONFIG.key?("LIBRUBYARG_STATIC")
+- Config::expand(CONFIG["LIBRUBYARG_STATIC"].dup).sub(/^-l/, '')
++ if RbConfig::CONFIG["ENABLE_SHARED"] == "no"
++ libs = if RbConfig::CONFIG.key?("LIBRUBYARG_STATIC")
++ RbConfig::expand(RbConfig::CONFIG["LIBRUBYARG_STATIC"].dup).sub(/^-l/, '')
+ else
+- Config::expand(CONFIG["LIBRUBYARG"].dup).sub(/lib([^.]*).*/, '\\1')
++ RbConfig::expand(RbConfig::CONFIG["LIBRUBYARG"].dup).sub(/lib([^.]*).*/, '\\1')
+ end
+- find_library(libs, "ruby_init", Config::expand(CONFIG["archdir"].dup))
++ find_library(libs, "ruby_init", RbConfig::expand(RbConfig::CONFIG["archdir"].dup))
+ end
+ $objs = ["plruby.o", "plplan.o", "plpl.o", "pltrans.o"] unless $objs
+ create_makefile("plruby#{suffix}")
+--- postgresql-plruby-0.5.4/src/conversions/basic/extconf.rb.rbconfig 2010-01-02 04:08:20.000000000 +0900
++++ postgresql-plruby-0.5.4/src/conversions/basic/extconf.rb 2015-01-17 02:23:20.917758514 +0900
+@@ -1,4 +1,5 @@
+ require 'mkmf'
++include RbConfig
+
+ if CONFIG["LIBRUBYARG"] == "$(LIBRUBYARG_SHARED)" &&
+ !enable_config("plruby-shared")
+--- postgresql-plruby-0.5.4/src/conversions/bitstring/extconf.rb.rbconfig 2010-01-02 04:08:20.000000000 +0900
++++ postgresql-plruby-0.5.4/src/conversions/bitstring/extconf.rb 2015-01-17 02:22:31.577469892 +0900
+@@ -1,4 +1,5 @@
+ require 'mkmf'
++include RbConfig
+
+ if CONFIG["LIBRUBYARG"] == "$(LIBRUBYARG_SHARED)" &&
+ !enable_config("plruby-shared")
+--- postgresql-plruby-0.5.4/src/conversions/datetime/extconf.rb.rbconfig 2010-01-02 04:08:20.000000000 +0900
++++ postgresql-plruby-0.5.4/src/conversions/datetime/extconf.rb 2015-01-17 02:17:36.850745851 +0900
+@@ -1,4 +1,5 @@
+ require 'mkmf'
++include RbConfig
+
+ if CONFIG["LIBRUBYARG"] == "$(LIBRUBYARG_SHARED)" &&
+ !enable_config("plruby-shared")
+--- postgresql-plruby-0.5.4/src/conversions/geometry/extconf.rb.rbconfig 2010-01-02 04:08:20.000000000 +0900
++++ postgresql-plruby-0.5.4/src/conversions/geometry/extconf.rb 2015-01-17 02:23:24.909781866 +0900
+@@ -1,4 +1,5 @@
+ require 'mkmf'
++include RbConfig
+
+ if CONFIG["LIBRUBYARG"] == "$(LIBRUBYARG_SHARED)" &&
+ !enable_config("plruby-shared")
+--- postgresql-plruby-0.5.4/src/conversions/network/extconf.rb.rbconfig 2010-01-02 04:08:20.000000000 +0900
++++ postgresql-plruby-0.5.4/src/conversions/network/extconf.rb 2015-01-17 02:22:27.388445388 +0900
+@@ -1,4 +1,5 @@
+ require 'mkmf'
++include RbConfig
+
+ if CONFIG["LIBRUBYARG"] == "$(LIBRUBYARG_SHARED)" &&
+ !enable_config("plruby-shared")
+--- postgresql-plruby-0.5.4/test/conv_bitstring/b.rb.rbconfig 2010-01-02 04:08:20.000000000 +0900
++++ postgresql-plruby-0.5.4/test/conv_bitstring/b.rb 2015-01-17 02:23:30.873816754 +0900
+@@ -1,6 +1,6 @@
+ #!/usr/bin/ruby
+ require 'rbconfig'
+-include Config
++include RbConfig
+ pwd = Dir.pwd
+ pwd.sub!(%r{[^/]+/[^/]+$}, "")
+
+--- postgresql-plruby-0.5.4/test/conv_geometry/b.rb.rbconfig 2010-01-02 04:08:20.000000000 +0900
++++ postgresql-plruby-0.5.4/test/conv_geometry/b.rb 2015-01-17 02:24:13.731067453 +0900
+@@ -1,6 +1,6 @@
+ #!/usr/bin/ruby
+ require 'rbconfig'
+-include Config
++include RbConfig
+ pwd = Dir.pwd
+ pwd.sub!(%r{[^/]+/[^/]+$}, "")
+
+--- postgresql-plruby-0.5.4/test/conv_network/b.rb.rbconfig 2010-01-02 04:08:20.000000000 +0900
++++ postgresql-plruby-0.5.4/test/conv_network/b.rb 2015-01-17 02:24:09.054040094 +0900
+@@ -1,6 +1,6 @@
+ #!/usr/bin/ruby
+ require 'rbconfig'
+-include Config
++include RbConfig
+ pwd = Dir.pwd
+ pwd.sub!(%r{[^/]+/[^/]+$}, "")
+
+--- postgresql-plruby-0.5.4/test/plp/b.rb.rbconfig 2010-01-02 04:08:20.000000000 +0900
++++ postgresql-plruby-0.5.4/test/plp/b.rb 2015-01-17 02:23:52.894945569 +0900
+@@ -1,6 +1,6 @@
+ #!/usr/bin/ruby
+ require 'rbconfig'
+-include Config
++include RbConfig
+ pwd = Dir.pwd
+ pwd.sub!(%r{[^/]+/[^/]+$}, "")
+
+--- postgresql-plruby-0.5.4/test/plt/b.rb.rbconfig 2010-01-02 04:08:20.000000000 +0900
++++ postgresql-plruby-0.5.4/test/plt/b.rb 2015-01-17 02:24:03.033004873 +0900
+@@ -1,6 +1,6 @@
+ #!/usr/bin/ruby
+ require 'rbconfig'
+-include Config
++include RbConfig
+ pwd = Dir.pwd
+ pwd.sub!(%r{[^/]+/[^/]+$}, "")
+
+--- postgresql-plruby-0.5.4/test/range/b.rb.rbconfig 2010-01-02 04:08:20.000000000 +0900
++++ postgresql-plruby-0.5.4/test/range/b.rb 2015-01-17 02:24:20.178105166 +0900
+@@ -1,6 +1,6 @@
+ #!/usr/bin/ruby
+ require 'rbconfig'
+-include Config
++include RbConfig
+ pwd = Dir.pwd
+ pwd.sub!(%r{[^/]+/[^/]+$}, "")
+
diff --git a/postgresql-plruby.spec b/postgresql-plruby.spec
index e90bd96..04a1903 100644
--- a/postgresql-plruby.spec
+++ b/postgresql-plruby.spec
@@ -8,7 +8,7 @@
Summary: PostgreSQL Ruby Procedural Language
Name: postgresql-plruby
Version: 0.5.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Source0: https://github.com/knu/%{name}/archive/v0.5.4/%{name}-%{version}.tar.gz
License: Ruby or GPL+
Group: Applications/Databases
@@ -21,6 +21,7 @@ Patch0: postgresql-plruby-bitopers.patch
Patch2: postgresql-plruby-retval.patch
Patch3: postgresql-plruby-includes.patch
Patch4: postgresql-plruby-version.patch
+Patch5: postgresql-plruby-ruby22-rbconfig.patch
%description
PL/Ruby is a loadable procedural language for the PostgreSQL database
@@ -44,6 +45,7 @@ Documentation for plruby.
%patch2 -p1 -b .retval
%patch3 -p1 -b .debug
%patch4 -p1 -b .version
+%patch5 -p1 -b .rbconfig
%build
# Using safe-level=3, since Ruby 2.1+ and later does not support safe level
@@ -74,6 +76,10 @@ rm -rf %{buildroot}
%doc docs/plruby.rb
%changelog
+* Sat Jan 17 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.5.4-5
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
+- Fix obsolete Config:: usage
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list