SOURCES: rpm.macros - %php_pear_dir should be constant

[glen]

Author: glen                         Date: Wed Sep 27 20:00:51 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- %php_pear_dir should be constant

---- Files affected:
SOURCES:
   rpm.macros (1.319 -> 1.320) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.319 SOURCES/rpm.macros:1.320
--- SOURCES/rpm.macros:1.319	Fri Sep  8 14:48:46 2006
+++ SOURCES/rpm.macros	Wed Sep 27 22:00:46 2006
@@ -496,7 +496,7 @@
 
 # Ruby
 %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_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)
@@ -504,7 +504,7 @@
 %ruby_ver_requires_eq	Requires:	ruby(ver) = %ruby_version
 %ruby_mod_ver_requires_eq	Requires:	ruby-modules(ver) = %ruby_version
 
-%php_pear_dir	%{_datadir}/pear
+%php_pear_dir		/usr/share/pear
 
 # directory where php includes are installed on system.
 %__php_includedir		/usr/include/php
@@ -537,14 +537,14 @@
 
 # Python specific macro definitions.
 # python main version
-%py_ver		%(python -c "import sys; print sys.version[:3]")
+%py_ver			%(python -c "import sys; print sys.version[:3]")
 
 # directories
 %py_prefix		%(python -c "import sys; print sys.prefix")
 %py_libdir		%{py_prefix}/%{_lib}/python%{py_ver}
 %py_scriptdir	%{py_prefix}/share/python%{py_ver}
 %py_incdir		/usr/include/python%{py_ver}
-%py_sitedir	%{py_libdir}/site-packages
+%py_sitedir		%{py_libdir}/site-packages
 %py_sitescriptdir %{py_scriptdir}/site-packages
 %py_dyndir		%{py_libdir}/lib-dynload
 
================================================================

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