SOURCES: rpm.macros - add -D to %pear_package_setup to prevent bui...

glen glen at pld-linux.org
Wed Feb 28 03:10:19 CET 2007


Author: glen                         Date: Wed Feb 28 02:10:19 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- add -D to %pear_package_setup to prevent builddir removal

---- Files affected:
SOURCES:
   rpm.macros (1.374 -> 1.375) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.374 SOURCES/rpm.macros:1.375
--- SOURCES/rpm.macros:1.374	Tue Feb 27 00:30:52 2007
+++ SOURCES/rpm.macros	Wed Feb 28 03:10:13 2007
@@ -1070,10 +1070,10 @@
 # using this macro will append optional-packages.txt to the nocompressdoc list
 # as it's displayed to user after package install. and adding additional gzip
 # dep is just waste ;)
-%pear_package_setup(a:n:z) \
+%pear_package_setup(a:n:zD) \
 %define srcdir %{-n*}%{!-n:%{_pearname}-%{version}} \
 %define builddir %{_builddir}/%{srcdir} \
-%setup -q -c -T -n %{srcdir} \
+%setup -q -c -T %{-D:-D} -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} \
 %__pear \\\
================================================================

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



More information about the pld-cvs-commit mailing list