SOURCES: rpm.macros - fix last commit - add ruby_sitearchdir

[glen]

Author: glen                         Date: Sat Nov 19 12:49:33 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix last commit
- add ruby_sitearchdir

---- Files affected:
SOURCES:
   rpm.macros (1.262 -> 1.263) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.262 SOURCES/rpm.macros:1.263
--- SOURCES/rpm.macros:1.262	Sat Nov 19 13:09:54 2005
+++ SOURCES/rpm.macros	Sat Nov 19 13:49:27 2005
@@ -415,19 +415,20 @@
 %__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
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.262&r2=1.263&f=u