[eclipse-birt] Add data and data.aggregation plugins.

[Jeff Johnston]

commit 2de9f5c0422eda09f749a8943a13960c2b94b932
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Wed Jul 13 15:35:06 2011 -0400

    Add data and data.aggregation plugins.

 eclipse-birt.spec |   22 ++++++++++++++++++++--
 fetch-birt.sh     |    2 ++
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-birt.spec b/eclipse-birt.spec
index 973604f..d84e439 100644
--- a/eclipse-birt.spec
+++ b/eclipse-birt.spec
@@ -3,7 +3,7 @@
 
 Name:      eclipse-birt
 Version:   3.7.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Eclipse-based reporting system
 Group:     System Environment/Libraries
 License:   EPL
@@ -12,6 +12,7 @@ URL:       http://www.eclipse.org/birt/
 # Generate Source0 using Source1
 Source0:   %{name}-%{version}-fetched-src.tar.bz2
 Source1:   fetch-birt.sh
+Source2:   %{name}-fedora-data-feature.tar.bz2
 # smil in Fedora is merged in xml-commons-apis-ext.jar, reflecting upstream changes
 Patch0:    birt-remove-smil.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,6 +63,12 @@ you add charts to your own application.
 %prep
 %setup -q
 %patch0
+
+# add in a data feature to include birt data plugins
+pushd features
+tar -xjf %{SOURCE2}
+popd
+
 # make sure upstream hasn't snuck in any jars we don't know about
 find -name "*.jar" -exec rm {} \; 
 
@@ -89,15 +96,20 @@ ln -s %{_javadir}/js.jar
 popd
 
 %build
-# build only chart feature until dependencies (full dtp and wtp) are ready
+# build only chart feature and pared-down main feature until dependencies (full dtp and wtp) are ready
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.birt.chart \
                        -d "emf gef dtp-enablement dtp-connectivity dtp-modelbase dtp-sqldevtools" \
                        -o `pwd`/orbitDeps -v
+# build the added birt feature to contain org.eclipse.birt.data and org.eclipse.birt.data.aggregation plugins
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.birt.fedora.data  \
+                       -d "emf gef dtp-enablement dtp-connectivity dtp-modelbase dtp-sqldevtools" \
+                       -o `pwd`/orbitDeps -v
 
 %install
 rm -rf %{buildroot}
 install -d -m 755 %{buildroot}%{eclipse_dropin}
 unzip -q -d %{buildroot}%{eclipse_dropin}/birt build/rpmBuild/org.eclipse.birt.chart.zip
+unzip -q -d %{buildroot}%{eclipse_dropin}/birt build/rpmBuild/org.eclipse.birt.fedora.data.zip
 
 pushd %{buildroot}%{eclipse_dropin}/birt/eclipse/plugins
 rm -fr org.apache.batik.bridge_*.jar
@@ -139,8 +151,14 @@ rm -rf %{buildroot}
 %{eclipse_dropin}/birt
 %doc features/org.eclipse.birt.chart.feature/license.html
 %doc features/org.eclipse.birt.chart.feature/epl-v10.html
+%doc features/org.eclipse.birt.fedora.data.feature/license.html
+%doc features/org.eclipse.birt.fedora.data.feature/epl-v10.html
 
 %changelog
+* Wed Jul 13 2011 Jeff Johnston <jjohnstn at redhat.com> 3.7.0-3
+- Add feature to include org.eclipse.birt.data and
+
+  org.eclipse.birt.data.aggregation plugins.
 * Fri Jul 8 2011 Andrew Overholt <overholt at redhat.com> 3.7.0-2
 - Bump required version of batik to pick up proper OSGi manifests.
 
diff --git a/fetch-birt.sh b/fetch-birt.sh
index 7cdf246..3bfa076 100755
--- a/fetch-birt.sh
+++ b/fetch-birt.sh
@@ -23,6 +23,8 @@ org.eclipse.birt.chart.ui \
 org.eclipse.birt.chart.ui.extension \
 org.eclipse.birt.core \
 org.eclipse.birt.core.ui \
+org.eclipse.birt.data \
+org.eclipse.birt.data.aggregation \
 ; do
 cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/birt \
 export -r ${CVSTAG} source/$f;