From a14314e77f14955d060e6215fccb4587ecd11022 Mon Sep 17 00:00:00 2001 From: wolf Date: Sat, 19 Feb 2005 02:18:50 +0000 Subject: [PATCH] - 4.4.1 Changed files: rpm-magic-usesystem.patch -> 1.6 --- rpm-magic-usesystem.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rpm-magic-usesystem.patch b/rpm-magic-usesystem.patch index d3f4196..ee5ea04 100644 --- a/rpm-magic-usesystem.patch +++ b/rpm-magic-usesystem.patch @@ -1,12 +1,12 @@ --- rpm/build/rpmfc.c.orig 2004-11-22 11:39:55.000000000 +0100 +++ rpm/build/rpmfc.c 2004-11-22 18:09:14.400710096 +0100 @@ -1432,7 +1432,7 @@ - size_t slen; int fcolor; int xx; + /*@observer@*/ - static const char * magicfile = "/usr/lib/rpm/magic"; + static const char * magicfile = "/usr/share/file/magic"; - int msflags = MAGIC_COMPRESS|MAGIC_CHECK; /* XXX what MAGIC_FOO flags? */ + int msflags = MAGIC_CHECK; /* XXX MAGIC_COMPRESS flag? */ magic_t ms = NULL; diff -ur rpm.org/file/doc/Makefile.am rpm/file/doc/Makefile.am @@ -26,8 +26,8 @@ diff -ur rpm.org/file/Makefile.am rpm/file/Makefile.am EXTRA_DIST = ChangeLog LEGAL.NOTICE MAINT README --SUBDIRS = src magic doc -+SUBDIRS = src magic +-SUBDIRS = src magic doc python ++SUBDIRS = src magic python Tylko w rpm/file: Makefile.am.orig diff -ur rpm.org/file/src/Makefile.am rpm/file/src/Makefile.am --- rpm.org/file/src/Makefile.am 2004-11-18 15:04:33.000000000 +0100 @@ -47,7 +47,7 @@ diff -ur rpm.org/tools/Makefile.am rpm/tools/Makefile.am @@ -30,7 +30,7 @@ pkgbindir = @RPMCONFIGDIR@ - pkgbin_PROGRAMS = debugedit javadeps rpmcache rpmdeps rpmfile + pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps rpmfile -MAGIC = $(pkgbindir)/magic +MAGIC = /usr/share/file/magic -- 2.44.0