Hello community, here is the log from the commit of package file checked in at Fri Aug 31 18:40:51 CEST 2007. -------- --- file/file.changes 2007-08-29 19:02:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file.changes 2007-08-31 17:33:51.673897000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 17:32:04 CEST 2007 - werner@suse.de + +- Make regex for awk more robust to avoid conflict with PostScript, + thanks goes to Werner Lemberg for the report + +------------------------------------------------------------------- New: ---- file-4.21-awk.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.n10635/_old 2007-08-31 18:40:38.000000000 +0200 +++ /var/tmp/diff_new_pack.n10635/_new 2007-08-31 18:40:38.000000000 +0200 @@ -17,7 +17,7 @@ Group: Productivity/File utilities Autoreqprov: on Version: 4.21 -Release: 1 +Release: 3 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Patch: file-%{version}.dif @@ -34,6 +34,7 @@ Patch11: file-4.21-reg_dos.dif Patch12: file-4.21-option.dif Patch13: file-4.21-scribus.dif +Patch14: file-4.21-awk.dif Patch20: file-4.16-mips.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,6 +84,7 @@ %patch11 -p0 -b .reg %patch12 -p0 -b .opt %patch13 -p0 -b .scri +%patch14 -p0 -b .awk %ifarch mips %patch20 -p0 -b .mips %endif @@ -145,6 +147,9 @@ %attr(644,root,root) %{_mandir}/man3/libmagic.3.gz %changelog +* Fri Aug 31 2007 - werner@suse.de +- Make regex for awk more robust to avoid conflict with PostScript, + thanks goes to Werner Lemberg for the report * Wed Aug 29 2007 - werner@suse.de - Add Scribus to local magic (bug #298009) * Wed Jun 06 2007 - werner@suse.de ++++++ file-4.21-awk.dif ++++++ --- magic/Magdir/commands +++ magic/Magdir/commands 2007-08-31 17:24:19.872921232 +0200 @@ -29,7 +29,7 @@ 0 string/b #!\ /bin/awk awk script text 0 string/b #!\ /usr/bin/awk awk script text # update to distinguish from *.vcf files -0 regex BEGIN[[:space:]]*[{] awk script text +0 regex =^\\s*BEGIN\\s*[{] awk script text # AT&T Bell Labs' Plan 9 shell 0 string/b #!\ /bin/rc Plan 9 rc shell script text ++++++ file-4.21.dif ++++++ --- /var/tmp/diff_new_pack.n10635/_old 2007-08-31 18:40:39.000000000 +0200 +++ /var/tmp/diff_new_pack.n10635/_new 2007-08-31 18:40:39.000000000 +0200 @@ -1,6 +1,6 @@ --- .pkgextract +++ .pkgextract 2006-03-27 13:29:19.000000000 +0200 -@@ -0,0 +1,13 @@ +@@ -0,0 +1,14 @@ +patch -p0 -s --suffix=.misc < ../file-4.18-misc.dif +patch -p0 -s --suffix=.pcp < ../file-4.12-pcp.dif +patch -p0 -s --suffix=.exec < ../file-4.20-exec.dif @@ -14,6 +14,7 @@ +patch -p0 -s --suffix=.reg < ../file-4.21-reg_dos.dif +patch -p0 -s --suffix=.opt < ../file-4.21-option.dif +patch -p0 -s --suffix=.scri < ../file-4.21-scribus.dif ++patch -p0 -s --suffix=.awk < ../file-4.21-awk.dif --- magic/Header +++ magic/Header 2006-03-27 13:29:19.000000000 +0200 @@ -1,5 +1,7 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org