X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-magic-usesystem.patch;h=b392879d6fd72d1f4f8c80c4b56caaed8cb73a3b;hp=b1b148d90ba31d6c8da416ad76e6fbb863fb75e5;hb=4ff060daf65bf49dc9feef447c420e0c6b777c64;hpb=ed809d1d4f61edb01b21523b99f09fdf7b9f02db

diff --git a/rpm-magic-usesystem.patch b/rpm-magic-usesystem.patch
index b1b148d..b392879 100644
--- a/rpm-magic-usesystem.patch
+++ b/rpm-magic-usesystem.patch
@@ -28,28 +28,3 @@ diff -ur rpm.org/file/src/Makefile.am rpm/file/src/Makefile.am
  
  AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
  
-diff -ur rpm.org/tools/Makefile.am rpm/tools/Makefile.am
---- rpm.org/tools/Makefile.am	2004-11-22 00:56:22.484205000 +0100
-+++ rpm/tools/Makefile.am	2004-11-22 01:03:05.178339563 +0100
-@@ -30,7 +30,7 @@
- pkgbindir = @RPMCONFIGDIR@
- pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps \
- 	rpmcache rpmdeps rpmfile
--MAGIC	= $(pkgbindir)/magic
-+MAGIC	= /usr/share/file/magic
- 
- bin_PROGRAMS =	 rpmdigest 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
-+	rpmcache rpmdeps @WITH_RPMFILE@
- MAGIC	= /usr/share/file/magic
- 
- bin_PROGRAMS =	 rpmdigest rpmgraph