Upgrade to file-4.12 (with RH patches).

CVS patchset: 7661
CVS date: 2005/01/03 02:02:54

1 files changed, 6 insertions, 4 deletions

diff --git a/file/magic/Makefile.am b/file/magic/Makefile.am
index eb8116c2b..82e27193a 100644
--- a/file/magic/Makefile.am
+++ b/file/magic/Makefile.am
@@ -1,6 +1,4 @@
-#pkgdata_DATA = magic magic.mime magic.mgc magic.mime.mgc
-pkglibdir =  @prefix@/lib/rpm
-pkglib_DATA = magic magic.mime magic.mgc magic.mime.mgc
+pkgdata_DATA = magic magic.mime magic.mgc magic.mime.mgc
 
 EXTRA_DIST = magic2mime Localstuff Header magic.mime $(magic_FRAGMENTS)
 
@@ -69,11 +67,11 @@ Magdir/diff \
 Magdir/digital \
 Magdir/dolby \
 Magdir/dump \
-Magdir/dyadic \
 Magdir/editors \
 Magdir/elf \
 Magdir/encore \
 Magdir/epoc \
+Magdir/esri \
 Magdir/fcs \
 Magdir/filesystems \
 Magdir/flash \
@@ -149,6 +147,7 @@ Magdir/pgp \
 Magdir/pkgadd \
 Magdir/plan9 \
 Magdir/plus5 \
+Magdir/policy \
 Magdir/printer \
 Magdir/project \
 Magdir/psdbms \
@@ -171,6 +170,7 @@ Magdir/sinclair \
 Magdir/sketch \
 Magdir/smalltalk \
 Magdir/sniffer \
+Magdir/dyadic \
 Magdir/softquad \
 Magdir/spectrum \
 Magdir/sql \
@@ -191,6 +191,7 @@ Magdir/varied.out \
 Magdir/varied.script \
 Magdir/vax \
 Magdir/vicar \
+Magdir/virtutech \
 Magdir/visx \
 Magdir/vms \
 Magdir/vmware \
@@ -199,6 +200,7 @@ Magdir/vxl \
 Magdir/wordprocessors \
 Magdir/xdelta \
 Magdir/xenix \
+Magdir/xo65 \
 Magdir/xwindows \
 Magdir/zilog \
 Magdir/zyxel