rpm/allowufdio.diff
OBS User autobuild bd93352974 Accepting request 36638 from Base:System
Copy from Base:System/rpm based on submit request 36638 from user oertel

OBS-URL: https://build.opensuse.org/request/show/36638
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=95
2010-04-01 16:15:26 +00:00

24 lines
774 B
Diff

--- ./build/pack.c.orig 2010-03-25 15:18:23.000000000 +0000
+++ ./build/pack.c 2010-03-25 15:23:54.000000000 +0000
@@ -375,7 +375,9 @@ rpmRC writeRPM(Header *hdrp, unsigned ch
const char *compr = NULL;
headerPutString(h, RPMTAG_PAYLOADFORMAT, "cpio");
- if (rstreq(s+1, "gzdio")) {
+ if (rstreq(s+1, "ufdio")) {
+ compr = NULL;
+ } else if (rstreq(s+1, "gzdio")) {
compr = "gzip";
#if HAVE_BZLIB_H
} else if (rstreq(s+1, "bzdio")) {
@@ -398,7 +400,8 @@ rpmRC writeRPM(Header *hdrp, unsigned ch
goto exit;
}
- headerPutString(h, RPMTAG_PAYLOADCOMPRESSOR, compr);
+ if (compr)
+ headerPutString(h, RPMTAG_PAYLOADCOMPRESSOR, compr);
buf = xstrdup(rpmio_flags);
buf[s - rpmio_flags] = '\0';
headerPutString(h, RPMTAG_PAYLOADFLAGS, buf+1);