SOURCES: rpm-macros.patch, rpm-lzma2.patch - uh, unify with Ac-branch

[glen]

Author: glen                         Date: Wed May 24 09:07:50 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- uh, unify with Ac-branch

---- Files affected:
SOURCES:
   rpm-macros.patch (1.26 -> 1.27) , rpm-lzma2.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/rpm-macros.patch
diff -u SOURCES/rpm-macros.patch:1.26 SOURCES/rpm-macros.patch:1.27
--- SOURCES/rpm-macros.patch:1.26	Sat Nov 19 14:01:52 2005
+++ SOURCES/rpm-macros.patch	Wed May 24 11:07:45 2006
@@ -1,5 +1,5 @@
---- rpm-4.4.3/macros.in.orig	2005-11-19 01:18:44.483914640 +0100
-+++ rpm-4.4.3/macros.in	2005-11-19 01:19:50.657854672 +0100
+--- rpm-4.4.3/macros.in	2005-11-19 01:19:50.657854672 +0100
++++ rpm-4.4.6/macros.in	2006-05-24 11:49:38.438332239 +0300
 @@ -219,7 +219,7 @@
  %_tmppath		%{_var}/tmp
  
@@ -9,6 +9,17 @@
  
  #	The path to the unzip executable (legacy, use %{__unzip} instead).
  %_unzipbin		%{__unzip}
+@@ -330,8 +330,8 @@
+ #		"w9.gzdio"	gzip level 9 (default).
+ #		"w9.bzdio"	bzip2 level 9.
+ #
+-#%_source_payload	w9.gzdio
+-#%_binary_payload	w9.gzdio
++%_source_payload	w9.gzdio
++%_binary_payload	w9.lzdio
+ 
+ #	Archive formats to use for source/binary package payloads.
+ #		"cpio"		cpio archive (default)
 @@ -932,10 +932,10 @@
    export RPM_BUILD_ROOT}\
    %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
@@ -22,8 +33,7 @@
    \
    %{verbose:set -x}%{!verbose:exec > /dev/null}\
    umask 022\
-@@ -1373,5 +1373,18 @@
- #%__executable_provides	@RPMCONFIGDIR@/executabledeps.sh --provides
+@@ -1374,4 +1374,17 @@
  #%__executable_requires	@RPMCONFIGDIR@/executabledeps.sh --requires
  
 +# PLD rpm macros

================================================================
Index: SOURCES/rpm-lzma2.patch
diff -u SOURCES/rpm-lzma2.patch:1.3 SOURCES/rpm-lzma2.patch:1.4
--- SOURCES/rpm-lzma2.patch:1.3	Wed May 24 10:51:56 2006
+++ SOURCES/rpm-lzma2.patch	Wed May 24 11:07:45 2006
@@ -512,16 +512,3 @@
  
  		gzdi = Fdopen(fdi, rpmio_flags);	/* XXX gzdi == fdi */
  		if (gzdi == NULL) {
---- rpm-4.4.6/macros.in~	2006-05-24 11:46:48.794530959 +0300
-+++ rpm-4.4.6/macros.in	2006-05-24 11:49:38.438332239 +0300
-@@ -330,8 +330,8 @@
- #		"w9.gzdio"	gzip level 9 (default).
- #		"w9.bzdio"	bzip2 level 9.
- #
--#%_source_payload	w9.gzdio
--#%_binary_payload	w9.gzdio
-+%_source_payload	w9.gzdio
-+%_binary_payload	w9.lzdio
- 
- #	Archive formats to use for source/binary package payloads.
- #		"cpio"		cpio archive (default)
================================================================

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