From a1fba39a9c03c3e834ecd716fe5274f38b0ee59f Mon Sep 17 00:00:00 2001
From: gil <puntogil@libero.it>
Date: Feb 02 2015 01:14:01 +0000
Subject: add antlr 3.5.2 support


---

diff --git a/eclipselink-2.4.2-build.xml b/eclipselink-2.4.2-build.xml
index d423f2e..53a5f99 100644
--- a/eclipselink-2.4.2-build.xml
+++ b/eclipselink-2.4.2-build.xml
@@ -18,7 +18,7 @@
     <pathelement location="${dir.build}/classes/**"/>
     <fileset dir="${dir.build}"    includes="eclipselink.jar"/>
     <fileset dir="/usr/share/java" includes="ant.jar"/>
-    <fileset dir="/usr/share/java" includes="antlr32/antlr-runtime-3.1.3.jar"/>
+    <fileset dir="/usr/share/java" includes="antlr3-runtime.jar"/>
     <fileset dir="/usr/share/java" includes="eclipse/osgi.jar"/>
     <fileset dir="/usr/share/java" includes="geronimo-jms.jar"/>
     <!--fileset dir="/usr/share/java" includes="hibernate-jpa-2.0-api.jar"/-->
@@ -65,8 +65,8 @@
         debug="false">
         <classpath>
           <pathelement path="/usr/share/java/ant/ant-antlr3.jar"/>
-          <pathelement path="/usr/share/java/antlr32/antlr-3.1.3.jar"/>
-          <pathelement path="/usr/share/java/antlr32/antlr-runtime-3.1.3.jar"/>
+          <pathelement path="/usr/share/java/antlr3.jar"/>
+          <pathelement path="/usr/share/java/antlr3-runtime.jar"/>
           <pathelement path="/usr/share/java/stringtemplate4.jar"/>
           <!--pathelement path="/usr/share/java/ant.jar"/-->
           <!--pathelement path="/usr/share/java/antlr.jar"/-->
diff --git a/eclipselink.spec b/eclipselink.spec
index 7fb4ccb..c46807b 100644
--- a/eclipselink.spec
+++ b/eclipselink.spec
@@ -2,7 +2,7 @@
 %global namedversion %{version}%{?reltag}
 Name:          eclipselink
 Version:       2.4.2
-Release:       7%{?dist}
+Release:       8%{?dist}
 Summary:       Eclipse Persistence Services Project
 License:       EPL and BSD
 Url:           http://www.eclipse.org/eclipselink/
@@ -23,8 +23,8 @@ BuildRequires: jpackage-utils
 
 BuildRequires: ant
 BuildRequires: ant-antlr3
-BuildRequires: antlr32-java
-BuildRequires: antlr32-tool
+BuildRequires: antlr3-java
+BuildRequires: antlr3-tool
 BuildRequires: codemodel
 BuildRequires: stringtemplate4
 BuildRequires: eclipse-equinox-osgi
@@ -42,7 +42,7 @@ BuildRequires: tomcat-servlet-3.0-api
 BuildRequires: tuscany-sdo-java
 BuildRequires: wsdl4j
 
-Requires:      antlr32-tool
+Requires:      antlr3-tool
 Requires:      eclipselink-persistence-api
 Requires:      objectweb-asm3
 Requires:      tuscany-sdo-java
@@ -119,6 +119,9 @@ for s in org/eclipse/persistence/jpa/jpql/parser/AbstractExpression.java \
   org/eclipse/persistence/platform/database/MaxDBPlatform.java;do
   native2ascii -encoding UTF8 ${s} ${s}
 done
+# temporary fix for antlr 3.5.2
+sed -i.antlr352 "s|Token.EOF_TOKEN|Token.EOF|" \
+ org/eclipse/persistence/internal/jpa/parsing/jpql/JPQLParser.java
 
 %build
 
@@ -159,6 +162,9 @@ cp -pr target/api/* %{buildroot}%{_javadocdir}/%{name}
 %license license.html
 
 %changelog
+* Mon Feb 02 2015 gil cattaneo <puntogil@libero.it> 2.4.2-8
+- add antlr 3.5.2 support
+
 * Sun Feb 01 2015 gil cattaneo <puntogil@libero.it> 2.4.2-7
 - introduce license macro
 
@@ -184,4 +190,4 @@ cp -pr target/api/* %{buildroot}%{_javadocdir}/%{name}
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
 * Tue Apr 03 2012 gil cattaneo <puntogil@libero.it> 2.3.2-1
-- initial rpm
\ No newline at end of file
+- initial rpm