- %filterout_* support (in build-specyfic macros because of awk requeriment)

[packages/rpm.git] / rpm-lzma2.patch

diff --git a/rpm-lzma2.patch b/rpm-lzma2.patch
index 416ba6777568b3c5b2f9ed9ce12c6cef87ce4d92..437e08bd04a1aec5799eb41ace30e20e5e86965c 100644 (file)
--- a/rpm-lzma2.patch
+++ b/rpm-lzma2.patch
@@ -205,7 +205,7 @@ diff -Nru rpm-4.4.5.old/rpmio/rpmio.c rpm-4.4.5/rpmio/rpmio.c
 +        dup2(p[0], 0);
 +        dup2(fdno, 1);
 +        for (i = 3; i < 1024; i++) close(i);
-+        if (execlp("lzma", "lzma", "e", "-si", "-so", NULL)) {
++        if (execl("/usr/bin/lzma", "lzma", "e", "-si", "-so", NULL)) {
 +            _exit(1);
 +          }
 +    }
@@ -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)