- update

Changed files:
    rpm-magic-usesystem.patch -> 1.4

diff --git a/rpm-magic-usesystem.patch b/rpm-magic-usesystem.patch
index edab548eabbff93b3f78df67f73674fd8d1c2432..4a20827aa6717f33c5b6cd6df568bee13e829a66 100644 (file)
--- a/rpm-magic-usesystem.patch
+++ b/rpm-magic-usesystem.patch
@@ -1,14 +1,26 @@
-diff -urN rpm-4.3.org/file/Makefile.am rpm-4.3/file/Makefile.am
---- rpm-4.3.org/file/Makefile.am       2004-01-07 02:01:53.050779393 +0100
-+++ rpm-4.3/file/Makefile.am   2004-01-07 02:10:07.851944923 +0100
-@@ -1,3 +1,3 @@
- EXTRA_DIST = LEGAL.NOTICE MAINT Makefile.std
+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
+@@ -1,4 +1,4 @@
+-MAGIC  = $(pkgdatadir)/magic
++MAGIC  = /usr/share/file/magic
+ if FSECT5
+ man_MAGIC = magic.5
+ else
+Tylko w rpm/file/doc: Makefile.am~
+diff -ur rpm.org/file/Makefile.am rpm/file/Makefile.am
+--- rpm.org/file/Makefile.am   2004-11-18 15:04:32.000000000 +0100
++++ rpm/file/Makefile.am       2004-11-22 01:01:36.817958788 +0100
+@@ -3,4 +3,4 @@
+ 
+ EXTRA_DIST = ChangeLog LEGAL.NOTICE MAINT README
  
 -SUBDIRS = src magic doc
 +SUBDIRS = src magic
-diff -urN rpm-4.3.org/file/src/Makefile.am rpm-4.3/file/src/Makefile.am
---- rpm-4.3.org/file/src/Makefile.am   2004-01-07 02:01:54.159548970 +0100
-+++ rpm-4.3/file/src/Makefile.am       2004-01-07 02:09:30.670672672 +0100
+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
++++ rpm/file/src/Makefile.am   2004-11-22 01:01:36.823963503 +0100
 @@ -3,7 +3,7 @@
  
  #MAGIC         = $(pkgdatadir)/magic
@@ -18,4 +30,15 @@ diff -urN rpm-4.3.org/file/src/Makefile.am rpm-4.3/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 = debugedit javadeps rpmcache rpmdeps rpmfile
+-MAGIC = $(pkgbindir)/magic
++MAGIC = /usr/share/file/magic
+ 
+ bin_PROGRAMS =        rpmgraph
+