SOURCES: rpm.macros - no %{dirname:xxx} expand in rpm 4.4.9

glen glen at pld-linux.org
Tue Aug 26 15:49:59 CEST 2008


Author: glen                         Date: Tue Aug 26 13:49:59 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- no %{dirname:xxx} expand in rpm 4.4.9

---- Files affected:
SOURCES:
   rpm.macros (1.472 -> 1.473) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.472 SOURCES/rpm.macros:1.473
--- SOURCES/rpm.macros:1.472	Tue Aug 12 19:54:19 2008
+++ SOURCES/rpm.macros	Tue Aug 26 15:49:53 2008
@@ -1159,7 +1159,7 @@
 	--nodeps \\\
 	%{-f:--force} \\\
 	%{!-z:%{S:%{-a*}%{!-a:0}}}%{-z:$_P} > .install.log || { c=$?; cat .install.log; exit $c; }; \
-	%{-c:cp -a %{builddir}/%{builddir}/%{php_pear_dir} %{builddir}/%{dirname:%{php_pear_dir}}; rm -rf %{builddir}/%{builddir}; } \
+	%{-c:cp -a %{builddir}/%{builddir}/%{php_pear_dir} %{builddir}/%(dirname %{php_pear_dir}); rm -rf %{builddir}/%{builddir}; } \
 %{nil}
 
 # The main macro.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.472&r2=1.473&f=u



More information about the pld-cvs-commit mailing list