rpms/file/devel file-4.14-magic_mime.patch, NONE, 1.1 file.spec, 1.27, 1.28

[fedora-cvs-commits at redhat.com]

Author: rvokal

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

Modified Files:
	file.spec 
Added Files:
	file-4.14-magic_mime.patch 
Log Message:
 - fixed mime types recognition (#163866) <mandriva.org>

file-4.14-magic_mime.patch:
 magic.mime |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE file-4.14-magic_mime.patch ---
Index: magic/magic.mime
===================================================================
RCS file: /src/pub/file/magic/magic.mime,v
retrieving revision 1.17
diff -u -r1.17 magic.mime
--- magic/magic.mime	25 Jun 2005 15:52:14 -0000	1.17
+++ magic/magic.mime	6 Jul 2005 13:12:35 -0000
@@ -44,7 +44,7 @@
 #audio/x-tracker-module
 ##>17	string	>\0		Title: "%s"
 
-21	string/c	!SCREAM!	audio/x-mod
+21	string/c	\!SCREAM!	audio/x-mod
 #audio/x-screamtracker-module
 21	string	BMOD2STM	audio/x-mod
 #audio/x-screamtracker-module
@@ -342,7 +342,7 @@
 0	short		0143561		application/x-cpio	swapped
 
 0	string		=<ar>		application/x-archive
-0	string		!<arch>		application/x-archive
+0	string		\!<arch>	application/x-archive
 >8	string		debian		application/x-debian-package
 
 #------------------------------------------------------------------------------


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- file.spec	14 Jul 2005 07:55:51 -0000	1.27
+++ file.spec	22 Jul 2005 07:55:40 -0000	1.28
@@ -13,6 +13,7 @@
 Patch3: file-4.14-magic.patch
 Patch5: file-4.13-fsdump.patch
 Patch6: file-4.13-quick.patch
+Patch7: file-4.14-magic_mime.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 
@@ -33,6 +34,7 @@
 %patch3 -p1 -b .magic
 %patch5 -p1 -b .fsdump
 %patch6 -p1 -b .quick
+%patch7 -b .magic_mime
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
@@ -77,6 +79,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Fri Jul 22 2005 Radek Vokal <rvokal at redhat.com> - 4.14-2
+- fixed mime types recognition (#163866) <mandriva.org>
+
 * Thu Jul 14 2005 Radek Vokal <rvokal at redhat.com> - 4.14-1
 - sync with upstream, patch clean-up