diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2009-03-18 09:42:23 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2009-03-18 09:42:23 +0200 |
| commit | 8078d0ba24662308b10d9eb0f0da978584b7e757 (patch) | |
| tree | d006abb3b7cce4eb328a233c1c8cfc96c8b60b53 /build | |
| parent | ff920a9766ea1f3ef9670c8031ff473adb0b0adf (diff) | |
| download | rpm-8078d0ba24662308b10d9eb0f0da978584b7e757.tar.gz rpm-8078d0ba24662308b10d9eb0f0da978584b7e757.tar.bz2 rpm-8078d0ba24662308b10d9eb0f0da978584b7e757.zip | |
LZMA -> XZ renaming
- what we support now in payloads is XZ, not the former LZMA format, rename
user- and header-visible parts to match this
- rpmlib(PayloadIsXz) dependency versioned 5.2-1 to avoid unnecessary
incompatibility with what rpm5 has and what Mandriva is already using
- only provide the rpmlib dependency if actually built with xz support
- rpmFileIsCompressed() attempts to guess the magicless old lzma format
by file suffix, so it can handle both right now
Diffstat (limited to 'build')
| -rw-r--r-- | build/pack.c | 6 | ||||
| -rw-r--r-- | build/parsePrep.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/build/pack.c b/build/pack.c index 9d2be0cce..31350e90d 100644 --- a/build/pack.c +++ b/build/pack.c @@ -385,9 +385,9 @@ rpmRC writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileName, compr = "bzip2"; /* Add prereq on rpm version that understands bzip2 payloads */ (void) rpmlibNeedsFeature(h, "PayloadIsBzip2", "3.0.5-1"); - } else if (strcmp(s+1, "lzdio") == 0) { - compr = "lzma"; - (void) rpmlibNeedsFeature(h, "PayloadIsLzma", "4.4.90-1"); + } else if (strcmp(s+1, "xzdio") == 0) { + compr = "xz"; + (void) rpmlibNeedsFeature(h, "PayloadIsXz", "5.2-1"); } else { rpmlog(RPMLOG_ERR, _("Unknown payload compression: %s\n"), rpmio_flags); diff --git a/build/parsePrep.c b/build/parsePrep.c index fbb63db34..9a919bd8b 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -203,6 +203,9 @@ static char *doUntar(rpmSpec spec, uint32_t c, int quietly) case COMPRESSED_LZMA: t = "%{__lzma} -dc"; break; + case COMPRESSED_XZ: + t = "%{__xz} -dc"; + break; } zipper = rpmGetPath(t, NULL); if (needtar) { |