rpms/file/devel file-5.00-devdrv.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 file.spec, 1.87, 1.88 sources, 1.23, 1.24

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/file/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14347

Modified Files:
	.cvsignore file.spec sources 
Added Files:
	file-5.00-devdrv.patch 
Log Message:

upgrade to 5.00


file-5.00-devdrv.patch:

--- NEW FILE file-5.00-devdrv.patch ---
diff -up file-5.00/magic/Magdir/msdos.devdrv file-5.00/magic/Magdir/msdos
--- file-5.00/magic/Magdir/msdos.devdrv	2009-02-09 14:35:12.000000000 +0100
+++ file-5.00/magic/Magdir/msdos	2009-02-09 14:37:32.000000000 +0100
@@ -294,22 +294,37 @@
 >10	string	>\x23			
 >>10	string	!\x2e			
 >>>17	string	<\x5B			
->>>>10	string	x			\b, name: %.8s
-#UDMA.SYS KEYB.SYS CMD640X2.SYS
+>>>>10	string	CMD640X2.SYS			\b, name: %.8s
+#UDMA.SYS
 >10	string	<\x41			
 >>12	string	>\x40			
 >>>10	string	!$			
->>>>12	string	x			\b, name: %.8s
-#BTCDROM.SYS ASPICD.SYS
+>>>>12	string	UDMA.SYS			\b, name: %.8s
+#CMD640X2.SYS
+>10	string	<\x41			
+>>12	string	>\x40			
+>>>10	string	!$			
+>>>>12	string	CMD640X2.SYS			\b, name: %.8s
+#KEYB.SYS
+>10	string	<\x41			
+>>12	string	>\x40			
+>>>10	string	!$			
+>>>>12	string	KEYB.SYS			\b, name: %.8s
+#BTCDROM.SYS
+>22	string	>\x40			
+>>22	string	<\x5B			
+>>>23	string	<\x5B			
+>>>>22	string	BTCDROM.SYS			\b, name: %.8s
+#ASPICD.SYS
 >22	string	>\x40			
 >>22	string	<\x5B			
 >>>23	string	<\x5B			
->>>>22	string	x			\b, name: %.8s
+>>>>22	string	ASPICD.SYS			\b, name: %.8s
 #ATAPICD.SYS
 >76	string	\0			
 >>77	string	>\x40			
 >>>77	string	<\x5B			
->>>>77	string	x			\b, name: %.8s
+>>>>77	string	ATAPICD.SYS			\b, name: %.8s
 # test too generic ?
 0	byte		0x8c		DOS executable (COM)
 # updated by Joerg Jenderek at Oct 2008


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/file/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	15 Sep 2008 14:37:29 -0000	1.23
+++ .cvsignore	9 Feb 2009 14:03:14 -0000	1.24
@@ -1 +1 @@
-file-4.26.tar.gz
+file-5.00.tar.gz


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/devel/file.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- file.spec	14 Jan 2009 14:57:56 -0000	1.87
+++ file.spec	9 Feb 2009 14:03:14 -0000	1.88
@@ -4,19 +4,14 @@
 
 Summary: A utility for determining file types
 Name: file
-Version: 4.26
-Release: 9%{?dist}
+Version: 5.00
+Release: 1%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
 URL: http://www.darwinsys.com/file/
 Patch0: file-4.21-pybuild.patch
-Patch1: file-4.26-devdrv.patch
-Patch2: file-4.26-mime-encoding.patch
-Patch3: file-4.26-perl5.patch
-Patch4: file-4.26-graphviz-latex.patch
-Patch5: file-4.26-btrfs.patch
-Patch6: file-4.26-jpeg2000.patch
+Patch1: file-5.00-devdrv.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,16 +60,6 @@
 %patch0 -p1
 #fixes #463809
 %patch1 -p1
-#fixes #465994
-%patch2 -p1
-#fixes #470811
-%patch3 -p1
-#fixes #474156
-%patch4 -p1
-#fixes #479300
-%patch5 -p1
-#fixes #476655
-%patch6 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -148,6 +133,10 @@
 %endif
 
 %changelog
+* Mon Feb 09 2009 Daniel Novotny <dnovotny at redhat.com> 5.00-1
+- upgrade to 5.00
+- drop upstreamed patches, rebase remaining patch
+
 * Wed Jan 14 2009 Daniel Novotny <dnovotny at redhat.com> 4.26-9
 - fix #476655 detect JPEG-2000 Code Stream Bitmap
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/file/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	15 Sep 2008 14:37:29 -0000	1.23
+++ sources	9 Feb 2009 14:03:14 -0000	1.24
@@ -1 +1 @@
-74cd5466416136da30a4e69f74dbc7a0  file-4.26.tar.gz
+fd0b4ce55a756151629e06eaa3411e0c  file-5.00.tar.gz