[virtuoso-opensource] gawk4 patch Requires: gawk

Rex Dieter rdieter at fedoraproject.org
Tue Oct 11 20:22:31 UTC 2011


commit bbd9e77d47d870292c27de918543445dec9f84b5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 11 15:22:30 2011 -0500

    gawk4 patch
    Requires: gawk

 virtuoso-opensource-6.1.3-gawk4.patch |   22 ++++++++++++++++++++++
 virtuoso-opensource.spec              |   13 ++++++++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/virtuoso-opensource-6.1.3-gawk4.patch b/virtuoso-opensource-6.1.3-gawk4.patch
new file mode 100644
index 0000000..5337fab
--- /dev/null
+++ b/virtuoso-opensource-6.1.3-gawk4.patch
@@ -0,0 +1,22 @@
+diff -u -r1.51.2.7 libsrc/Wisql_to_c.awk
+--- libsrc/Wi/sql_to_c.aw	27 Oct 2010 12:31:21 -0000	1.51.2.7
++++ libsrc/Wi/sql_to_c.awk	30 Aug 2011 14:30:58 -0000
+@@ -339,9 +339,17 @@
+ 		    if (length() < 2)
+ 		      next
+ 		  }
++
+                 # does escape the symbols
+ 		fun = $0
+-	        gsub ( /\\/, "\\\\", fun)
++		q = "\\\\"
++		if (PROCINFO["version"] ~ /^4/)
++		    gsub ( q, q q, fun)
++		else
++		    gsub ( q, q, fun)
++
++	        #WAS: gsub ( /\\/, "\\\\", fun)
++
+ 		# remove whitespace except when there is just a semicolon
+ 		if ((in_xsl_mode == 0) && (in_xsd_mode == 0))
+   		  {
diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec
index 28f9285..2add880 100644
--- a/virtuoso-opensource.spec
+++ b/virtuoso-opensource.spec
@@ -5,7 +5,7 @@
 Name:    virtuoso-opensource
 Epoch:   1
 Version: 6.1.3
-Release: 2%{?dist}.1
+Release: 3%{?dist}
 Summary: A high-performance object-relational SQL database
 
 Group:   Applications/Databases
@@ -29,9 +29,14 @@ Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch
 # https://bugzilla.redhat.com/728857
 # http://bugs.kde.org/271664
 Patch100: virtuoso-opensource-6.1.3-encoding.patch
+# http://lwn.net/Articles/451578/
+# https://sourceforge.net/tracker/?func=detail&aid=3358418&group_id=161622&atid=820574
+# gawk4 compatibility
+Patch101: virtuoso-opensource-6.1.3-gawk4.patch
 
 BuildRequires: bison
 BuildRequires: flex
+BuildRequires: gawk
 BuildRequires: gperf
 BuildRequires: htmldoc
 ## when/if we ever decide to build and ship .jar's
@@ -51,6 +56,7 @@ Obsoletes: virtuoso-opensource-conductor < %{version}-%{release}
 Obsoletes: virtuoso-opensource-doc < %{version}-%{release} 
 %endif
 
+Requires: gawk
 
 %description
 Virtuoso is a scalable cross-platform server that combines SQL/RDF/XML
@@ -93,6 +99,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 #patch51 -p1 -b .external_iodbc
 %patch100 -p0 -b .encoding
+%patch101 -p0 -b .gawk4
 
 %if 0%{?_disable_all_vads:1}
 %patch52 -p1 -b .nodemos_buildfix
@@ -203,6 +210,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 11 2011 Rex Dieter <rdieter at fedoraproject.org> 6.1.3-3
+- gawk4 patch
+- Requires: gawk
+
 * Tue Oct 11 2011 Rex Dieter <rdieter at fedoraproject.org> 6.1.3-2.1
 - respin, enable 'make check'
 


More information about the scm-commits mailing list