]>
Commit | Line | Data |
---|---|---|
e2ea9e4f PS |
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 | |
3 | @@ -1432,7 +1432,7 @@ | |
e2ea9e4f PS |
4 | int fcolor; |
5 | int xx; | |
a14314e7 | 6 | /*@observer@*/ |
e2ea9e4f PS |
7 | - static const char * magicfile = "/usr/lib/rpm/magic"; |
8 | + static const char * magicfile = "/usr/share/file/magic"; | |
a14314e7 | 9 | int msflags = MAGIC_CHECK; /* XXX MAGIC_COMPRESS flag? */ |
e2ea9e4f PS |
10 | magic_t ms = NULL; |
11 | ||
6f7a48a4 AM |
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 | |
15 | @@ -1,4 +1,4 @@ | |
16 | -MAGIC = $(pkgdatadir)/magic | |
17 | +MAGIC = /usr/share/file/magic | |
18 | if FSECT5 | |
19 | man_MAGIC = magic.5 | |
20 | else | |
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 | |
25 | @@ -3,4 +3,4 @@ | |
26 | ||
27 | EXTRA_DIST = ChangeLog LEGAL.NOTICE MAINT README | |
a00926bc | 28 | |
a14314e7 | 29 | -SUBDIRS = src magic doc python |
30 | +SUBDIRS = src magic python | |
6f7a48a4 AM |
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 | |
aa0d0676 | 35 | @@ -3,7 +3,7 @@ |
a00926bc | 36 | |
aa0d0676 | 37 | #MAGIC = $(pkgdatadir)/magic |
a00926bc | 38 | pkglibdir = @prefix@/lib/rpm |
aa0d0676 AM |
39 | -MAGIC = $(pkglibdir)/magic |
40 | +MAGIC = /usr/share/file/magic | |
41 | ||
42 | AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' | |
a00926bc | 43 | |
6f7a48a4 AM |
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 | |
47 | @@ -30,7 +30,7 @@ | |
48 | ||
49 | pkgbindir = @RPMCONFIGDIR@ | |
a14314e7 | 50 | pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps rpmfile |
6f7a48a4 AM |
51 | -MAGIC = $(pkgbindir)/magic |
52 | +MAGIC = /usr/share/file/magic | |
53 | ||
54 | bin_PROGRAMS = rpmgraph | |
55 | ||
c91fb1e4 AM |
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 | |
59 | @@ -28,7 +28,7 @@ | |
60 | noinst_PROGRAMS = dumpdb | |
61 | ||
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 | |
66 | ||
67 | bin_PROGRAMS = rpmgraph |