- uh, unify with Ac-branch

Changed files:
    rpm-lzma2.patch -> 1.4
    rpm-macros.patch -> 1.27

diff --git a/rpm-lzma2.patch b/rpm-lzma2.patch
index 416ba6777568b3c5b2f9ed9ce12c6cef87ce4d92..b2d2972404ab8505c7a5b2c009f4d8fd1e36ea21 100644 (file)
--- a/rpm-lzma2.patch
+++ b/rpm-lzma2.patch
@@ -512,16 +512,3 @@ diff -Nru rpm-4.4.5.old/tools/rpmtool.c rpm-4.4.5/tools/rpmtool.c
  
                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)

diff --git a/rpm-macros.patch b/rpm-macros.patch
index f5705f9d83ffdd9a6e14b5328f21f842618d4507..16e51a4fd1f68d0bf24f77fb80d5334d18cebf48 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -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