[eclipse-birt] Update to 3.7.0 (Indigo)

[Andrew Overholt]

commit e27133ea291510d1e92c6974aeed25d26da29349
Author: Andrew Overholt <overholt at redhat.com>
Date:   Thu Jul 7 15:06:24 2011 -0400

    Update to 3.7.0 (Indigo)
    
    Don't fetch rhino (it's coming from Orbit now).  Require newer versions
    of other Eclipse dependencies.

 .gitignore        |    1 +
 eclipse-birt.spec |   38 ++++++++++++++++++++------------------
 fetch-birt.sh     |    7 ++-----
 sources           |    2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fc774fe..7a1e5c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ birt-source-2_5_0.zip
 birt-source-2_5_1.zip
 birt-source-2_5_2.zip
 eclipse-birt-2.6.0-fetched-src.tar.bz2
+eclipse-birt-3.7.0-fetched-src.tar.bz2
diff --git a/eclipse-birt.spec b/eclipse-birt.spec
index fef078e..d2fef3b 100644
--- a/eclipse-birt.spec
+++ b/eclipse-birt.spec
@@ -2,8 +2,8 @@
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
 
 Name:      eclipse-birt
-Version:   2.6.0
-Release:   2%{?dist}
+Version:   3.7.0
+Release:   1%{?dist}
 Summary:   Eclipse-based reporting system
 Group:     System Environment/Libraries
 License:   EPL
@@ -24,7 +24,11 @@ BuildRequires:    eclipse-pde >= 1:3.4.1
 BuildRequires:    eclipse-dtp
 BuildRequires:    eclipse-emf
 BuildRequires:    eclipse-gef
-BuildRequires:    rhino
+# 1.7-0.9.r2 is the first evr to contain OSGi metadata
+BuildRequires:    rhino >= 1.7-0.9.r2
+# FIXME:  should probably have a BuildRequires: rhino < 1.7-0.10.r3 here
+# 351482: Imported class removed in Rhino (org.mozilla.javascript) 1.7R3
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=351482
 BuildRequires:    batik >= 1.7-3
 BuildRequires:    fop >= 0.95-2
 BuildRequires:    jakarta-commons-codec >= 1.3-9.4
@@ -32,11 +36,15 @@ BuildRequires:    sac >= 1.3-3.3
 
 Requires:         java
 Requires:         jpackage-utils
-Requires:         eclipse-platform >= 1:3.4.1
-Requires:         eclipse-dtp
-Requires:         eclipse-emf
-Requires:         eclipse-gef
-Requires:         rhino
+Requires:         eclipse-platform >= 1:3.7.0
+Requires:         eclipse-dtp >= 1.9.0
+Requires:         eclipse-emf >= 2.7.0
+Requires:         eclipse-gef >= 3.7.0
+# 1.7-0.9.r2 is the first evr to contain OSGi metadata
+Requires:    rhino >= 1.7-0.9.r2
+# FIXME:  should probably have a Requires: rhino < 1.7-0.10.r3 here
+# 351482: Imported class removed in Rhino (org.mozilla.javascript) 1.7R3
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=351482
 Requires:         batik >= 1.7-3
 Requires:         fop >= 0.95-2
 Requires:         jakarta-commons-codec >= 1.3-9.4
@@ -55,11 +63,6 @@ you add charts to your own application.
 # make sure upstream hasn't snuck in any jars we don't know about
 find -name "*.jar" -exec rm {} \; 
 
-# symlink rhino in its plugin
-pushd org.mozilla.rhino/lib
-ln -s %{_javadir}/js.jar js.jar
-popd
-
 # symlink orbit deps
 mkdir orbitDeps
 pushd orbitDeps
@@ -80,6 +83,7 @@ ln -s %{_javadir}/batik/batik-xml.jar
 ln -s %{_javadir}/xml-commons-apis-ext.jar
 ln -s %{_javadir}/fop.jar
 ln -s %{_javadir}/sac.jar
+ln -s %{_javadir}/js.jar
 popd
 
 %build
@@ -93,11 +97,6 @@ rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
 unzip -q -d %{buildroot}%{eclipse_dropin}/birt build/rpmBuild/org.eclipse.birt.chart.zip
 
-pushd %{buildroot}%{eclipse_dropin}/birt/eclipse/plugins/org.mozilla.rhino_1.7.1.*/lib
-rm -fr js.jar
-ln -s ../../../../../../../java/js.jar
-popd
-
 pushd %{buildroot}%{eclipse_dropin}/birt/eclipse/plugins
 rm -fr org.apache.batik.bridge_*.jar
 ln -s ../../../../../java/batik/batik-bridge.jar
@@ -140,6 +139,9 @@ rm -rf %{buildroot}
 %doc features/org.eclipse.birt.chart.feature/epl-v10.html
 
 %changelog
+* Wed Jul 6 2011 Andrew Overholt <overholt at redhat.com> 3.7.0-1
+- Update to 3.7.0.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/fetch-birt.sh b/fetch-birt.sh
index 9505700..7cdf246 100755
--- a/fetch-birt.sh
+++ b/fetch-birt.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-CVSTAG=BIRT_2_6_0_Release_201006171315 
+CVSTAG=BIRT_3_7_0_Release_201106091010
 RHINOTAG=v20090608
-VERSION=2.6.0
+VERSION=3.7.0
 
 rm -fr eclipse-birt-${VERSION}
 
@@ -28,9 +28,6 @@ cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/birt \
 export -r ${CVSTAG} source/$f;
 done
 
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/birt \
-export -r ${RHINOTAG} source/org.mozilla.rhino
-
 mv source/* .
 rmdir source
 popd
diff --git a/sources b/sources
index 337c7f0..82b3589 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ba1e5dd7ef51c0fbe8eb2186d72ba6d  eclipse-birt-2.6.0-fetched-src.tar.bz2
+225fa3482ab1ddadeb947cf915ea4a15  eclipse-birt-3.7.0-fetched-src.tar.bz2