SOURCES: rpm.macros - fix broken merge

[glen]

Author: glen                         Date: Wed Nov  8 21:11:20 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix broken merge

---- Files affected:
SOURCES:
   rpm.macros (1.324 -> 1.325) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.324 SOURCES/rpm.macros:1.325
--- SOURCES/rpm.macros:1.324	Wed Nov  8 22:08:13 2006
+++ SOURCES/rpm.macros	Wed Nov  8 22:11:15 2006
@@ -972,8 +972,8 @@
 # as it's displayed to user after package install. and adding additional gzip
 # dep is just waste ;)
 %pear_package_setup(a:n:z) \
-%srcdir %{-n*}%{!-n:%{_pearname}-%{version}} \
-%builddir %{_builddir}/%{srcdir} \
+%define srcdir %{-n*}%{!-n:%{_pearname}-%{version}} \
+%define builddir %{_builddir}/%{srcdir} \
 %setup -q -c -T -n %{srcdir} \
 %{-z:tar zxf %{S:0}; %{-a:tar zxf %{S:%{-a*}}}} \
 %{-z:_P=package2.xml; [ -f $_P ] || _P=package.xml; _N=%{srcdir}; mv $_P $_N; cd $_N} \
================================================================

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