- fix webapps module restart

[packages/rpm.git] / rpm-magic-usesystem.patch

diff --git a/rpm-magic-usesystem.patch b/rpm-magic-usesystem.patch
index 4a20827aa6717f33c5b6cd6df568bee13e829a66..84d83397ae7268bfbcf4d67f20d7db4c05c5a6da 100644 (file)
--- a/rpm-magic-usesystem.patch
+++ b/rpm-magic-usesystem.patch
@@ -1,3 +1,14 @@
+--- 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 @@
+     int fcolor;
+     int xx;
+ /*@observer@*/
+-    static const char * magicfile = "/usr/lib/rpm/magic";
++    static const char * magicfile = "/usr/share/file/magic";
+     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
 --- rpm.org/file/doc/Makefile.am       2004-11-18 15:04:33.000000000 +0100
 +++ rpm/file/doc/Makefile.am   2004-11-22 01:02:30.114807597 +0100
@@ -15,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
@@ -36,9 +47,21 @@ 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
  
  bin_PROGRAMS =        rpmgraph
  
+diff -urbB rpm-4.4.2.org/tools/Makefile.am rpm-4.4.2/tools/Makefile.am
+--- rpm-4.4.2.org/tools/Makefile.am    2005-09-03 16:35:22.169432000 +0200
++++ rpm-4.4.2/tools/Makefile.am        2005-09-03 16:36:53.947479736 +0200
+@@ -28,7 +28,7 @@
+ noinst_PROGRAMS = dumpdb
+ 
+ pkgbindir = @RPMCONFIGDIR@
+-pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps rpmfile
++pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps @WITH_RPMFILE@
+ MAGIC = /usr/share/file/magic
+ 
+ bin_PROGRAMS =        rpmgraph