From 333e32effa8f55b0fc5a2cf44e7640bf3bdb6d4cc202d3f533380381306fcf1a Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 31 Aug 2007 16:40:51 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=11

---
 file-4.21-awk.dif | 11 +++++++++++
 file-4.21.dif     |  3 ++-
 file.changes      |  6 ++++++
 file.spec         |  7 ++++++-
 4 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 file-4.21-awk.dif

diff --git a/file-4.21-awk.dif b/file-4.21-awk.dif
new file mode 100644
index 0000000..9c945c8
--- /dev/null
+++ b/file-4.21-awk.dif
@@ -0,0 +1,11 @@
+--- 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
diff --git a/file-4.21.dif b/file-4.21.dif
index f090993..790222a 100644
--- a/file-4.21.dif
+++ b/file-4.21.dif
@@ -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 @@
diff --git a/file.changes b/file.changes
index 1202bd6..9faf73c 100644
--- a/file.changes
+++ b/file.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Wed Aug 29 19:01:31 CEST 2007 - werner@suse.de
 
diff --git a/file.spec b/file.spec
index 2a968be..31d8b70 100644
--- a/file.spec
+++ b/file.spec
@@ -17,7 +17,7 @@ License:        Other uncritical OpenSource License
 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 @@ Patch10:        file-4.18-printf.dif
 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 @@ Authors:
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %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