[eclipse-birt] Update to the 4.2.1 release.

[Krzysztof Daniel]

commit d472914efe776c4775eb4c36555dea7e95a27342
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Oct 5 12:16:40 2012 +0200

    Update to the 4.2.1 release.

 .gitignore                                |    4 ++++
 eclipse-birt-build-with-rhino-1.7R3.patch |   10 +++++-----
 eclipse-birt.spec                         |   12 ++++++++----
 fetch-birt.sh                             |    4 ++--
 sources                                   |    2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d5aef39..9771398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,7 @@ eclipse-birt-3.7.1-fetched-src.tar.bz2
 /eclipse-birt-4.2.0-M6-fetched-src.tar.bz2
 /eclipse-birt-4.2.0-M6
 /eclipse-birt-4.2.0-fetched-src.tar.bz2
+/eclipse-birt-4.2.1-fetched-src.tar.bz2
+/eclipse-birt-4.2.1
+/.project
+*.src.rpm
diff --git a/eclipse-birt-build-with-rhino-1.7R3.patch b/eclipse-birt-build-with-rhino-1.7R3.patch
index c15ed35..cf8fb46 100644
--- a/eclipse-birt-build-with-rhino-1.7R3.patch
+++ b/eclipse-birt-build-with-rhino-1.7R3.patch
@@ -151,7 +151,7 @@ diff --git a/core/org.eclipse.birt.core/src/org/eclipse/birt/core/data/OlapExpre
 index e3e4bc4..ea26f97 100644
 --- a/core/org.eclipse.birt.core/src/org/eclipse/birt/core/data/OlapExpressionCompiler.java
 +++ b/core/org.eclipse.birt.core/src/org/eclipse/birt/core/data/OlapExpressionCompiler.java
-@@ -19,7 +19,7 @@ import org.mozilla.javascript.CompilerEnvirons;
+@@ -21,7 +21,7 @@
  import org.mozilla.javascript.Context;
  import org.mozilla.javascript.Node;
  import org.mozilla.javascript.Parser;
@@ -160,16 +160,16 @@ index e3e4bc4..ea26f97 100644
  import org.mozilla.javascript.Token;
  
  /**
-@@ -43,7 +43,7 @@ class OlapExpressionCompiler
+@@ -46,7 +46,7 @@
  			Context cx = Context.enter( );
  			CompilerEnvirons ce = new CompilerEnvirons( );
  			Parser p = new Parser( ce, cx.getErrorReporter( ) );
 -			ScriptOrFnNode tree = p.parse( expr, null, 0 );
 +			ScriptNode tree = p.parse( expr, null, 0 );
  
- 			return getScriptObjectName( tree, "measure" );
- 		}
-@@ -72,7 +72,7 @@ class OlapExpressionCompiler
+ 			getScriptObjectName( tree, "measure", result );
+ 			
+@@ -77,7 +77,7 @@
  			Context cx = Context.enter( );
  			CompilerEnvirons ce = new CompilerEnvirons( );
  			Parser p = new Parser( ce, cx.getErrorReporter( ) );
diff --git a/eclipse-birt.spec b/eclipse-birt.spec
index 3030c14..cb4013f 100644
--- a/eclipse-birt.spec
+++ b/eclipse-birt.spec
@@ -8,12 +8,12 @@
 #  sed "s/org.eclipse.birt.feature.group=//" | \
 #  sed "s/%%{version}.//" | \
 #  sed "s/-.*//"
-%global qualifier v20110905
-%global tag BIRT_4_2_0_Release_201206131143
+%global qualifier v201209121721
+%global tag BIRT_4_2_1_Release_201209121721
 
 Name:      eclipse-birt
-Version:   4.2.0
-Release:   2%{?dist}
+Version:   4.2.1
+Release:   1%{?dist}
 Summary:   Eclipse-based reporting system
 Group:     System Environment/Libraries
 License:   EPL
@@ -118,6 +118,7 @@ ln -s %{_javadir}/batik/batik-xml.jar
 ln -s %{_javadir}/xml-commons-apis-ext.jar
 ln -s %{_javadir}/fop.jar
 ln -s %{_javadir}/js.jar
+ln -s %{_javadir}/xerces-j2.jar
 popd
 
 %build
@@ -175,6 +176,9 @@ popd
 %doc org.eclipse.birt.data.fedora.feature/epl-v10.html
 
 %changelog
+* Fri Oct 5 2012 Krzysztof Daniel <kdaniel at redhat.com> 4.2.1-1
+- Update to the 4.2.1 release.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/fetch-birt.sh b/fetch-birt.sh
index c71f3f9..f44febc 100755
--- a/fetch-birt.sh
+++ b/fetch-birt.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-TAG=BIRT_4_2_0_Release_201206131143
-VERSION=4.2.0
+TAG=BIRT_4_2_1_Release_201209121721
+VERSION=4.2.1
 
 rm -fr eclipse-birt-${VERSION}
 
diff --git a/sources b/sources
index 58b25ab..da8d49a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1bc4eeb27e0320f43015e8df2050ac5a  eclipse-birt-4.2.0-fetched-src.tar.bz2
+a78f15768b3fe3016875b37ffca3c465  eclipse-birt-4.2.1-fetched-src.tar.bz2
 c1d9741b061a5bbc66e1181318b1ec53  eclipse-birt-fedora-data-feature.tar.bz2