- fix last commit

- add ruby_sitearchdir

Changed files:
    rpm.macros -> 1.263

diff --git a/rpm.macros b/rpm.macros
index 9975b634a56687d23cb63ff82ffb1b38aaf83861..f54de865ba5a9e8f20909d7fe7488e5c87709103 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -415,19 +415,20 @@ fi \
 %__mono_requires %{nil}
 
 # Perl specific macro definitions.
-%perl_privlib  %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib)
-%perl_archlib  %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib)
-%perl_vendorlib        %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%perl_privlib          %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib)
+%perl_archlib          %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib)
+%perl_vendorlib                %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
 %perl_vendorarch       %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
-%perl_sitelib  %(eval "`%{__perl} -V:installsitelib`"; echo $installsitelib)
-%perl_sitearch %(eval "`%{__perl} -V:installsitearch`"; echo $installsitearch)
+%perl_sitelib          %(eval "`%{__perl} -V:installsitelib`"; echo $installsitelib)
+%perl_sitearch         %(eval "`%{__perl} -V:installsitearch`"; echo $installsitearch)
 
 # Ruby
-%define        ruby_archdir    %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
-%define        ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define        ruby_ridir      %(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_vers
+%ruby_archdir          %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
+%ruby_rubylibdir               %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
+%ruby_ridir            %(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_vers
 ion"], "system")')
-%define        ruby_version    %(ruby -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
+%ruby_sitearchdir      %(ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
+%ruby_version          %(ruby -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
 
 %php_pear_dir  %{_datadir}/pear