Author: glen Date: Sat Dec 31 13:36:47 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- always output something in ruby macros, so spec can be parsed
---- Files affected:
SOURCES:
rpm.macros (1.278 -> 1.279)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.278 SOURCES/rpm.macros:1.279
--- SOURCES/rpm.macros:1.278 Sat Dec 31 13:03:34 2005
+++ SOURCES/rpm.macros Sat Dec 31 14:36:41 2005
@@ -424,12 +424,12 @@
%perl_sitearch %(eval "`%{__perl} -V:installsitearch`"; echo
$installsitearch)
# Ruby
-%ruby_archdir %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
-%ruby_ridir %(ruby -r rbconfig -e 'include Config; print
File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
-%ruby_rubylibdir %(ruby -r rbconfig -e 'print
Config::CONFIG["rubylibdir"]')
-%ruby_sitearchdir %(ruby -r rbconfig -e 'print
Config::CONFIG["sitearchdir"]')
-%ruby_sitelibdir %(ruby -r rbconfig -e 'print
Config::CONFIG["sitelibdir"]')
-%ruby_version %(ruby -r rbconfig -e 'print
Config::CONFIG["ruby_version"]')
+%ruby_archdir %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]'
2>/dev/null || echo ERROR)
+%ruby_ridir %(ruby -r rbconfig -e 'include Config; print
File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")'
2>/dev/null || echo ERROR)
+%ruby_rubylibdir %(ruby -r rbconfig -e 'print
Config::CONFIG["rubylibdir"]' 2>/dev/null || echo ERROR)
+%ruby_sitearchdir %(ruby -r rbconfig -e 'print
Config::CONFIG["sitearchdir"]' 2>/dev/null || echo ERROR)
+%ruby_sitelibdir %(ruby -r rbconfig -e 'print
Config::CONFIG["sitelibdir"]' 2>/dev/null || echo ERROR)
+%ruby_version %(ruby -r rbconfig -e 'print
Config::CONFIG["ruby_version"]' 2>/dev/null || echo ERROR)
%ruby_ver_requires_eq Requires: ruby(ver) = %ruby_version
%ruby_mod_ver_requires_eq Requires: ruby-modules(ver) =
%ruby_version
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.278&r2=1.279&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
