RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 27-Dec-2007 10:11:21
Branch: HEAD Handle: 2007122709112001
Modified files:
rpm CHANGES
rpm/rpmio macro.c
Log:
- fix %{uncompress:<file>.lzo} by passing the required "-dc" options to
LZOP's lzop(1)
- fix %{uncompress:<file>.lzma} by passing the required "-dc" options to
LZMA Utils' lzma(1) (we are already assuming to use LZMA Utils' lzma(1)
during compression, so this is a safe assumption here, too)
Summary:
Revision Changes Path
1.2020 +2 -0 rpm/CHANGES
2.161 +2 -2 rpm/rpmio/macro.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2019 -r1.2020 CHANGES
--- rpm/CHANGES 26 Dec 2007 10:40:44 -0000 1.2019
+++ rpm/CHANGES 27 Dec 2007 09:11:20 -0000 1.2020
@@ -1,4 +1,6 @@
5.0b3 -> 5.0b4:
+ - rse: fix %{uncompress:<file>.lzo} by passing the required "-dc"
options to LZOP's lzop(1)
+ - rse: fix %{uncompress:<file>.lzma} by passing the required "-dc"
options to LZMA Utils' lzma(1)
- rse: support arbitrary hash algorithm via the originally intended
syntax "digest([<algorithm>:]/path) = hex"
- rse: compare MD5 hex value on "digest(/path) = hex" dependency
case-insensitive to be less restrictive in syntax
- rse: merge scripts/lua-dump.lua directly into lua/local/llocal.lua to
make it always easily available
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
============================================================================
$ cvs diff -u -r2.160 -r2.161 macro.c
--- rpm/rpmio/macro.c 24 Dec 2007 09:00:07 -0000 2.160
+++ rpm/rpmio/macro.c 27 Dec 2007 09:11:21 -0000 2.161
@@ -1258,10 +1258,10 @@
sprintf(be, "%%__unzip -qq '%s'", b);
break;
case 4: /* COMPRESSED_LZOP */
- sprintf(be, "%%__lzop '%s'", b);
+ sprintf(be, "%%__lzop -dc '%s'", b);
break;
case 5: /* COMPRESSED_LZMA */
- sprintf(be, "%%__lzma '%s'", b);
+ sprintf(be, "%%__lzma -dc '%s'", b);
break;
}
b = be;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
