diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | build/rpmfc.c | 4 | ||||
| -rw-r--r-- | rpm.spec.in | 3 |
3 files changed, 5 insertions, 3 deletions
@@ -4,6 +4,7 @@ - popt 1.10.1 to preserve newer. - use package color as Obsoletes: color. - upgrade to db-4.3.27. + - revert MAGIC_COMPRESS, real fix is in libmagic (#143782). 4.3.3 -> 4.4: - pentium3/pentium4 arch support (pluto@PLD). diff --git a/build/rpmfc.c b/build/rpmfc.c index f7dcdae47..ae6b31c81 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -1172,7 +1172,7 @@ int rpmfcClassify(rpmfc fc, ARGV_t argv) int fcolor; int xx; static const char * magicfile = "/usr/lib/rpm/magic"; - int msflags = MAGIC_COMPRESS|MAGIC_CHECK; /* XXX what MAGIC_FOO flags? */ + int msflags = MAGIC_CHECK; /* XXX MAGIC_COMPRESS flag? */ magic_t ms = NULL; if (fc == NULL || argv == NULL) @@ -1219,7 +1219,7 @@ assert(s != NULL); ftype = magic_file(ms, s); if (ftype == NULL) { xx = RPMERR_EXEC; - rpmError(xx, _("magic_file(ms, \"%s\") faileds: %s\n"), + rpmError(xx, _("magic_file(ms, \"%s\") failed: %s\n"), s, magic_error(ms)); assert(ftype != NULL); /* XXX figger a proper return path. */ } diff --git a/rpm.spec.in b/rpm.spec.in index 86eec1884..8fc0ca4f6 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -20,7 +20,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.4 +Release: 0.5 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz License: GPL @@ -498,6 +498,7 @@ exit 0 %changelog * Sun Jan 2 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-0.4 - upgrade to db-4.3.27. +- revert MAGIC_COMPRESS, real fix is in libmagic (#143782). * Tue Dec 7 2004 Jeff Johnson <jbj@jbj.org> 4.4.1-0.3 - use package color as Obsoletes: color. |