rpms/file/F-11 file-5.03-ifany.patch,NONE,1.1 file.spec,1.95,1.96

Daniel Novotny dnovotny at fedoraproject.org
Tue Sep 29 11:12:13 UTC 2009


Author: dnovotny

Update of /cvs/extras/rpms/file/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31237

Modified Files:
	file.spec 
Added Files:
	file-5.03-ifany.patch 
Log Message:
fix #526054


file-5.03-ifany.patch:
 lisp |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE file-5.03-ifany.patch ---
diff -up file-5.03/magic/Magdir/lisp.ifany file-5.03/magic/Magdir/lisp
--- file-5.03/magic/Magdir/lisp.ifany	2009-07-23 15:46:03.000000000 +0200
+++ file-5.03/magic/Magdir/lisp	2009-07-23 15:46:17.000000000 +0200
@@ -11,8 +11,6 @@
 #>2	search/4096	!\r		Lisp/Scheme program text
 #>2	search/4096	\r		Windows INF file
 
-0	search/4096	(if\ 			Lisp/Scheme program text
-!:mime	text/x-lisp
 0	search/4096	(setq\ 			Lisp/Scheme program text
 !:mime	text/x-lisp
 0	search/4096	(defvar\ 		Lisp/Scheme program text


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/F-11/file.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- file.spec	11 Jun 2009 12:22:53 -0000	1.95
+++ file.spec	29 Sep 2009 11:12:13 -0000	1.96
@@ -5,13 +5,14 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.03
-Release: 2%{?dist}
+Release: 3%{?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-5.00-devdrv.patch
+Patch2: file-5.03-ifany.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +61,8 @@ file(1) command.
 %patch0 -p1
 #fixes #463809
 %patch1 -p1
+#fixes #526054
+%patch2 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -134,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 29 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-3
+- fix #526054 - "file" reports c++ source files as "Lisp/Scheme program text"
+
 * Thu Jun 11 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-2
 - fix #500739 - Disorganized magic* file locations in file-libs
 




More information about the fedora-extras-commits mailing list