1 --- rpm/build/rpmfc.c.orig 2004-11-22 11:39:55.000000000 +0100
2 +++ rpm/build/rpmfc.c 2004-11-22 18:09:14.400710096 +0100
7 - static const char * magicfile = "/usr/lib/rpm/magic";
8 + static const char * magicfile = "/usr/share/file/magic";
9 int msflags = MAGIC_CHECK; /* XXX MAGIC_COMPRESS flag? */
12 diff -ur rpm.org/file/doc/Makefile.am rpm/file/doc/Makefile.am
13 --- rpm.org/file/doc/Makefile.am 2004-11-18 15:04:33.000000000 +0100
14 +++ rpm/file/doc/Makefile.am 2004-11-22 01:02:30.114807597 +0100
16 -MAGIC = $(pkgdatadir)/magic
17 +MAGIC = /usr/share/file/magic
21 Tylko w rpm/file/doc: Makefile.am~
22 diff -ur rpm.org/file/Makefile.am rpm/file/Makefile.am
23 --- rpm.org/file/Makefile.am 2004-11-18 15:04:32.000000000 +0100
24 +++ rpm/file/Makefile.am 2004-11-22 01:01:36.817958788 +0100
27 EXTRA_DIST = ChangeLog LEGAL.NOTICE MAINT README
29 -SUBDIRS = src magic doc python
30 +SUBDIRS = src magic python
31 Tylko w rpm/file: Makefile.am.orig
32 diff -ur rpm.org/file/src/Makefile.am rpm/file/src/Makefile.am
33 --- rpm.org/file/src/Makefile.am 2004-11-18 15:04:33.000000000 +0100
34 +++ rpm/file/src/Makefile.am 2004-11-22 01:01:36.823963503 +0100
37 #MAGIC = $(pkgdatadir)/magic
38 pkglibdir = @prefix@/lib/rpm
39 -MAGIC = $(pkglibdir)/magic
40 +MAGIC = /usr/share/file/magic
42 AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
44 diff -ur rpm.org/tools/Makefile.am rpm/tools/Makefile.am
45 --- rpm.org/tools/Makefile.am 2004-11-22 00:56:22.484205000 +0100
46 +++ rpm/tools/Makefile.am 2004-11-22 01:03:05.178339563 +0100
49 pkgbindir = @RPMCONFIGDIR@
50 pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps rpmfile
51 -MAGIC = $(pkgbindir)/magic
52 +MAGIC = /usr/share/file/magic
54 bin_PROGRAMS = rpmgraph
56 diff -urbB rpm-4.4.2.org/tools/Makefile.am rpm-4.4.2/tools/Makefile.am
57 --- rpm-4.4.2.org/tools/Makefile.am 2005-09-03 16:35:22.169432000 +0200
58 +++ rpm-4.4.2/tools/Makefile.am 2005-09-03 16:36:53.947479736 +0200
60 noinst_PROGRAMS = dumpdb
62 pkgbindir = @RPMCONFIGDIR@
63 -pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps rpmfile
64 +pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps @WITH_RPMFILE@
65 MAGIC = /usr/share/file/magic
67 bin_PROGRAMS = rpmgraph