SOURCES: rpm-macros.patch - fix prep failures

qboosh qboosh at pld-linux.org
Sat Nov 19 14:01:57 CET 2005


Author: qboosh                       Date: Sat Nov 19 13:01:57 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix prep failures

---- Files affected:
SOURCES:
   rpm-macros.patch (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SOURCES/rpm-macros.patch
diff -u SOURCES/rpm-macros.patch:1.25 SOURCES/rpm-macros.patch:1.26
--- SOURCES/rpm-macros.patch:1.25	Sat Nov 19 01:18:43 2005
+++ SOURCES/rpm-macros.patch	Sat Nov 19 14:01:52 2005
@@ -9,6 +9,19 @@
  
  #	The path to the unzip executable (legacy, use %{__unzip} instead).
  %_unzipbin		%{__unzip}
+@@ -932,10 +932,10 @@
+   export RPM_BUILD_ROOT}\
+   %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
+   export CLASSPATH}\
+-  unset PERL_MM_OPT\
++  unset PERL_MM_OPT || :\
+   LANG=C\
+   export LANG\
+-  unset DISPLAY\
++  unset DISPLAY || :\
+   \
+   %{verbose:set -x}%{!verbose:exec > /dev/null}\
+   umask 022\
 @@ -1373,5 +1373,18 @@
  #%__executable_provides	@RPMCONFIGDIR@/executabledeps.sh --provides
  #%__executable_requires	@RPMCONFIGDIR@/executabledeps.sh --requires
================================================================

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




More information about the pld-cvs-commit mailing list