rpms/file/devel file-4.14-kill3ds.patch, NONE, 1.1 file.spec, 1.29, 1.30

[fedora-cvs-commits at redhat.com]

Author: rvokal

Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14922

Modified Files:
	file.spec 
Added Files:
	file-4.14-kill3ds.patch 
Log Message:
 - mime for 3ds files removed, conflicts with text files (#165165)

file-4.14-kill3ds.patch:
 magic.mime |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE file-4.14-kill3ds.patch ---
--- file-4.14/magic/magic.mime.kill3ds	2005-08-05 11:09:51.000000000 +0200
+++ file-4.14/magic/magic.mime	2005-08-05 11:10:53.000000000 +0200
@@ -210,7 +210,7 @@
 0	string		/*\ XPM		image/x-xpmi 7bit
 
 # 3DS (3d Studio files)
-16	beshort		0x3d3d		image/x-3ds
+#16	beshort		0x3d3d		image/x-3ds
 
 # this first will upset you if you're a PL/1 shop... (are there any left?)
 # in which case rm it; ascmagic will catch real C programs


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- file.spec	22 Jul 2005 07:56:47 -0000	1.29
+++ file.spec	5 Aug 2005 09:15:04 -0000	1.30
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.14
-Release: 2
+Release: 3
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -14,6 +14,7 @@
 Patch5: file-4.13-fsdump.patch
 Patch6: file-4.13-quick.patch
 Patch7: file-4.14-magic_mime.patch
+Patch8: file-4.14-kill3ds.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 
@@ -35,6 +36,7 @@
 %patch5 -p1 -b .fsdump
 %patch6 -p1 -b .quick
 %patch7 -b .magic_mime
+%patch8 -p1 -b .kill3ds
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
@@ -79,6 +81,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Fri Aug 05 2005 Radek Vokal <rvokal at redhat.com> - 4.14-3
+- mime for 3ds files removed, conflicts with text files (#165165)
+
 * Fri Jul 22 2005 Radek Vokal <rvokal at redhat.com> - 4.14-2
 - fixed mime types recognition (#163866) <mandriva.org>