commit 05201fa3efcf82ee2ac81c4f6e9cd1949743c7d2
Author: Elan Ruusamäe <[email protected]>
Date: Fri Apr 26 00:55:09 2013 +0300
ruby: do not use deprecated Config::CONFIG
rpm-build-macros.spec | 2 +-
rpm.macros | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index a0094bc..813686d 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -4,7 +4,7 @@ Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
Name: rpm-build-macros
Version: %{rpm_macros_rev}
-Release: 3
+Release: 4
License: GPL
Group: Development/Building
Source0: rpm.macros
diff --git a/rpm.macros b/rpm.macros
index de56584..7d85bb5 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -897,18 +897,18 @@ fi; \
# Ruby
%__ruby /usr/bin/ruby
-%ruby_archdir %{expand:%%global ruby_archdir %(%{__ruby} -r rbconfig
-e 'print Config::CONFIG["archdir"]' 2>/dev/null || echo ERROR)}%ruby_archdir
-%ruby_libdir %{expand:%%global ruby_libdir %(%{__ruby} -r rbconfig
-e 'print Config::CONFIG["rubylibdir"]' 2>/dev/null || echo ERROR)}%ruby_libdir
+%ruby_archdir %{expand:%%global ruby_archdir %(%{__ruby} -r rbconfig
-e 'print RbConfig::CONFIG["archdir"]' 2>/dev/null || echo ERROR)}%ruby_archdir
+%ruby_libdir %{expand:%%global ruby_libdir %(%{__ruby} -r rbconfig
-e 'print RbConfig::CONFIG["rubylibdir"]' 2>/dev/null || echo
ERROR)}%ruby_libdir
%ruby_ridir %{expand:%%global ruby_ridir %(%{__ruby} -r
rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri",
CONFIG["ruby_version"], "system")' 2>/dev/null || echo ERROR)}%ruby_ridir
-%ruby_rubylibdir %{expand:%%global ruby_rubylibdir %(%{__ruby} -r
rbconfig -e 'print Config::CONFIG["rubylibdir"]' 2>/dev/null || echo
ERROR)}%ruby_rubylibdir
-%ruby_vendorarchdir %{expand:%%global ruby_vendorarchdir %(%{__ruby} -r
rbconfig -e 'print Config::CONFIG["vendorarchdir"]' 2>/dev/null || echo
ERROR)}%ruby_vendorarchdir
-%ruby_vendorlibdir %{expand:%%global ruby_vendorlibdir %(%{__ruby} -r
rbconfig -e 'print Config::CONFIG["vendorlibdir"]' 2>/dev/null || echo
ERROR)}%ruby_vendorlibdir
-%ruby_sitearchdir %{expand:%%global ruby_sitearchdir %(%{__ruby} -r
rbconfig -e 'print Config::CONFIG["sitearchdir"]' 2>/dev/null || echo
ERROR)}%ruby_sitearchdir
-%ruby_sitedir %{expand:%%global ruby_sitedir %(%{__ruby} -r rbconfig
-e 'print Config::CONFIG["sitedir"]' 2>/dev/null || echo ERROR)}%ruby_sitedir
-%ruby_sitelibdir %{expand:%%global ruby_sitelibdir %(%{__ruby} -r
rbconfig -e 'print Config::CONFIG["sitelibdir"]' 2>/dev/null || echo
ERROR)}%ruby_sitelibdir
+%ruby_rubylibdir %{expand:%%global ruby_rubylibdir %(%{__ruby} -r
rbconfig -e 'print RbConfig::CONFIG["rubylibdir"]' 2>/dev/null || echo
ERROR)}%ruby_rubylibdir
+%ruby_vendorarchdir %{expand:%%global ruby_vendorarchdir %(%{__ruby} -r
rbconfig -e 'print RbConfig::CONFIG["vendorarchdir"]' 2>/dev/null || echo
ERROR)}%ruby_vendorarchdir
+%ruby_vendorlibdir %{expand:%%global ruby_vendorlibdir %(%{__ruby} -r
rbconfig -e 'print RbConfig::CONFIG["vendorlibdir"]' 2>/dev/null || echo
ERROR)}%ruby_vendorlibdir
+%ruby_sitearchdir %{expand:%%global ruby_sitearchdir %(%{__ruby} -r
rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]' 2>/dev/null || echo
ERROR)}%ruby_sitearchdir
+%ruby_sitedir %{expand:%%global ruby_sitedir %(%{__ruby} -r rbconfig
-e 'print RbConfig::CONFIG["sitedir"]' 2>/dev/null || echo ERROR)}%ruby_sitedir
+%ruby_sitelibdir %{expand:%%global ruby_sitelibdir %(%{__ruby} -r
rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]' 2>/dev/null || echo
ERROR)}%ruby_sitelibdir
%ruby_rdocdir /usr/share/rdoc
-%ruby_vendordir %{expand:%%global ruby_vendordir %(%{__ruby} -r
rbconfig -e 'print Config::CONFIG["vendordir"]' 2>/dev/null || echo
ERROR)}%ruby_vendordir
-%ruby_version %{expand:%%global ruby_version %(%{__ruby} -r rbconfig
-e 'print Config::CONFIG["ruby_version"]' 2>/dev/null || echo
ERROR)}%ruby_version
+%ruby_vendordir %{expand:%%global ruby_vendordir %(%{__ruby} -r
rbconfig -e 'print RbConfig::CONFIG["vendordir"]' 2>/dev/null || echo
ERROR)}%ruby_vendordir
+%ruby_version %{expand:%%global ruby_version %(%{__ruby} -r rbconfig
-e 'print RbConfig::CONFIG["ruby_version"]' 2>/dev/null || echo
ERROR)}%ruby_version
%ruby_ver_requires_eq Requires: ruby(ver) = %ruby_version
%ruby_mod_ver_requires_eq Requires: ruby-modules(ver) =
%ruby_version
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/05201fa3efcf82ee2ac81c4f6e9cd1949743c7d2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
