rpms/file/F-12 file-5.03-ruby-modules.patch, NONE, 1.1 file.spec, 1.109, 1.110

Daniel Novotny dnovotny at fedoraproject.org
Tue Feb 9 15:54:07 UTC 2010


Author: dnovotny

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

Modified Files:
	file.spec 
Added Files:
	file-5.03-ruby-modules.patch 
Log Message:
- fix #562840 -  [PATCH] Add matches for ruby modules


file-5.03-ruby-modules.patch:
 ruby |   13 +++++++++++++
 1 file changed, 13 insertions(+)

--- NEW FILE file-5.03-ruby-modules.patch ---
diff -up file-5.03/magic/Magdir/ruby.modules file-5.03/magic/Magdir/ruby
--- file-5.03/magic/Magdir/ruby.modules	2010-02-09 16:48:13.000000000 +0100
+++ file-5.03/magic/Magdir/ruby	2010-02-09 16:50:21.000000000 +0100
@@ -8,3 +8,16 @@
 0	search/1/b	#!\ /usr/local/bin/ruby	Ruby script text executable
 0	search/1	#!/usr/bin/env\ ruby	Ruby script text executable
 0	search/1	#!\ /usr/bin/env\ ruby	Ruby script text executable
+
+
+# What looks like ruby, but does not have a shebang
+# (modules and such)
+# From: Lubomir Rintel <lkundrak at v3.sk>
+0	regex		\^[\ \t]*require[\ \t]'[A-Za-z_\/]+'
+>0	regex		include\ [A-Z]|def\ [a-z]|\ do$
+>>0	regex		\^[\ \t]*end([\ \t]*[;#].*)?$		Ruby script text
+!:mime	text/x-ruby
+0	regex		\^[\ \t]*(class|module)[\ \t][A-Z]
+>0	regex		(modul|includ)e\ [A-Z]|def\ [a-z]
+>>0	regex		\^[\ \t]*end([\ \t]*[;#].*)?$		Ruby module source text
+!:mime	text/x-ruby


Index: file.spec
===================================================================
RCS file: /cvs/extras/rpms/file/F-12/file.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- file.spec	30 Nov 2009 11:13:25 -0000	1.109
+++ file.spec	9 Feb 2010 15:54:06 -0000	1.110
@@ -5,7 +5,7 @@
 Summary: A utility for determining file types
 Name: file
 Version: 5.03
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: BSD
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -17,6 +17,7 @@ Patch3: file-5.03-fonts-postscript.patch
 Patch4: file-5.03-xfsdump.patch
 Patch5: file-5.03-ifany.patch
 Patch6: file-5.03-multilib.patch
+Patch7: file-5.03-ruby-modules.patch
 
 Requires: file-libs = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +73,8 @@ file(1) command.
 %patch5 -p1
 #fixes #515767
 %patch6 -p1
+#fixes #562840
+%patch7 -p1
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 touch -r doc/libmagic.man doc/libmagic.man_
@@ -146,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Feb 09 2010 Daniel Novotny <dnovotny at redhat.com> 5.03-13
+- fix #562840 -  [PATCH] Add matches for ruby modules
+
 * Mon Nov 30 2009 Daniel Novotny <dnovotny at redhat.com> 5.03-12
 - fix the patch for multilib (#515767) in Makefile.in
 



More information about the scm-commits mailing list