Author: glen Date: Fri Jan 25 00:36:32 2008 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- reset also LC_ALL,LINGUAS,LANGUAGE,LC_MESSAGES (moved from rpm-build-macros)
---- Files affected:
SOURCES:
rpm-macros.patch (1.23.2.7 -> 1.23.2.8)
---- Diffs:
================================================================
Index: SOURCES/rpm-macros.patch
diff -u SOURCES/rpm-macros.patch:1.23.2.7 SOURCES/rpm-macros.patch:1.23.2.8
--- SOURCES/rpm-macros.patch:1.23.2.7 Thu Oct 5 22:30:17 2006
+++ SOURCES/rpm-macros.patch Fri Jan 25 01:36:27 2008
@@ -1,5 +1,5 @@
---- rpm-4.4.2/macros.in~ 2006-01-17 20:55:45.000000000 +0200
-+++ rpm-4.4.2/macros.in 2006-01-17 20:57:51.000000000 +0200
+--- rpm-4.4.2/macros.in 2006-01-17 20:57:51.000000000 +0200
++++ rpm-4.4.2/macros.in 2008-01-25 02:28:21.000000000 +0200
@@ -223,7 +223,7 @@
%_tmppath %{_var}/tmp
@@ -20,7 +20,26 @@
# The signature to use and the location of configuration files for
# signing packages with PGP.
-@@ -1019,6 +1019,7 @@
+@@ -863,10 +863,17 @@
+ export RPM_BUILD_ROOT}\
+ %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
+ export CLASSPATH}\
++ unset PERL_MM_OPT || :\
++ export LC_ALL=C\
++ export LANG=C\
++ unset LINGUAS ||:\
++ unset LANGUAGE ||:\
++ unset LC_MESSAGES ||:\
++ unset DISPLAY ||:\
+ \
+ %{verbose:set -x}%{!verbose:exec > /dev/null}\
+ umask 022\
+- cd %{u2p:%{_builddir}}\
++ cd '%{u2p:%{_builddir}}'\
+
+
+ #%___build_body %{nil}
+@@ -1019,6 +1026,7 @@
%_oldincludedir /usr/include
%_infodir %{_prefix}/info
%_mandir %{_prefix}/man
@@ -28,7 +47,7 @@
#==============================================================================
# ---- config.guess platform macros.
-@@ -1157,36 +1157,6 @@
+@@ -1156,36 +1164,6 @@
%{-C:cd ${_mydir}; unset _mydir}
#------------------------------------------------------------------------------
@@ -65,7 +84,7 @@
# arch macro for all Intel i?86 compatibile processors
# (Note: This macro (and it's analogues) will probably be obsoleted when
# rpm can use regular expressions against target platforms in macro
-@@ -1277,4 +1277,17 @@
+@@ -1306,4 +1284,17 @@
%find_lang @RPMCONFIGDIR@/find-lang.sh %{buildroot}
+# PLD rpm macros
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-macros.patch?r1=1.23.2.7&r2=1.23.2.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
