[eclipse-birt] * Tue Aug 3 2010 Andrew Overholt <overholt at redhat.com> 2.6.0-1 - Update to 2.6.0. - Build rhino plug
Andrew Overholt
overholt at fedoraproject.org
Wed Aug 4 13:22:05 UTC 2010
commit 9bd208f927381f756df82d3e6fc1c0cd29a2ff78
Author: Andrew Overholt <overholt at redhat.com>
Date: Mon Aug 2 12:42:56 2010 -0400
* Tue Aug 3 2010 Andrew Overholt <overholt at redhat.com> 2.6.0-1
- Update to 2.6.0.
- Build rhino plugin as part of BIRT chart feature.
- Remove unnecessary dependencies.
.gitignore | 1 +
birt-remove-smil.patch | 22 ++--------------
eclipse-birt.spec | 64 ++++++++++++++++-------------------------------
sources | 2 +-
4 files changed, 27 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f19a36a..fc774fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ birt-source-2.5M7.zip
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
diff --git a/birt-remove-smil.patch b/birt-remove-smil.patch
index d27d9aa..b47357a 100644
--- a/birt-remove-smil.patch
+++ b/birt-remove-smil.patch
@@ -1,22 +1,6 @@
---- features/org.eclipse.birt.chart.runtime/feature.xml.old 2008-06-30 14:30:28.000000000 +0200
-+++ features/org.eclipse.birt.chart.runtime/feature.xml 2009-02-05 23:25:34.000000000 +0100
-@@ -189,13 +189,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.w3c.dom.smil"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.w3c.dom.svg"
- download-size="0"
- install-size="0"
---- features/org.eclipse.birt.chart/feature.xml.orig 2009-06-09 10:37:12.000000000 +0300
-+++ features/org.eclipse.birt.chart/feature.xml 2009-08-11 21:38:42.149411511 +0300
-@@ -205,13 +205,6 @@
+--- features/org.eclipse.birt.chart.feature/feature.xml.orig 2010-08-03 15:48:23.000000000 -0400
++++ features/org.eclipse.birt.chart.feature/feature.xml 2010-08-03 15:48:39.000000000 -0400
+@@ -198,13 +198,6 @@
unpack="false"/>
<plugin
diff --git a/eclipse-birt.spec b/eclipse-birt.spec
index 29e2b43..417e424 100644
--- a/eclipse-birt.spec
+++ b/eclipse-birt.spec
@@ -1,16 +1,17 @@
%global eclipse_base %{_libdir}/eclipse
%global eclipse_dropin %{_datadir}/eclipse/dropins
-%global rhinoqualifier v20090608
Name: eclipse-birt
-Version: 2.5.2
+Version: 2.6.0
Release: 1%{?dist}
Summary: Eclipse-based reporting system
Group: System Environment/Libraries
License: EPL
URL: http://www.eclipse.org/birt/
-Source0: http://download.eclipse.org/birt/downloads/drops/R-R1-2_5_2-201002221500/birt-source-2_5_2.zip
+# Generate Source0 using Source1
+Source0: %{name}-%{version}-fetched-src.tar.bz2
+Source1: fetch-birt.sh
# 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)
@@ -49,27 +50,19 @@ can add to your app server. BIRT also offers a charting engine that lets
you add charts to your own application.
%prep
-%setup -q -c
+%setup -q
%patch0
-# make sure upstream hasn't sneaked in any jars we don't know about
+# make sure upstream hasn't snuck in any jars we don't know about
find -name "*.jar" -exec rm {} \;
-#pde can't determine if this is plugin or fragment and stops further processing
-rm -fr plugins/org.eclipse.birt.chart.viewer
-
# symlink rhino in its plugin
-pushd plugins/org.mozilla.rhino/lib
+pushd org.mozilla.rhino/lib
ln -s %{_javadir}/js.jar js.jar
popd
# symlink orbit deps
mkdir orbitDeps
pushd orbitDeps
-ln -s %{_javadir}/xerces-j2.jar org.apache.xerces_2.9.0.jar
-ln -s %{_javadir}/xalan-j2-serializer.jar org.apache.xml.serializer_2.7.1.jar
-ln -s %{_javadir}/xml-commons-resolver.jar org.apache.xml.resolver_1.2.0.jar
-ln -s %{_javadir}/xml-commons-apis.jar javax.xml_1.3.4.jar
-ln -s %{_javadir}/wsdl4j.jar javax.wsdl_1.5.0.jar
ln -s %{_javadir}/commons-codec.jar org.apache.commons.codec_1.3.0.jar
ln -s %{_javadir}/batik/batik-bridge.jar
ln -s %{_javadir}/batik/batik-css.jar
@@ -91,8 +84,6 @@ popd
%build
# build only chart feature until dependencies (full dtp and wtp) are ready
-%{eclipse_base}/buildscripts/pdebuild -f org.mozilla.rhino \
- -a "-DforceContextQualifier=%{rhinoqualifier}"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.birt.chart \
-d "emf gef dtp-enablement dtp-connectivity dtp-modelbase dtp-sqldevtools" \
-o `pwd`/orbitDeps -v
@@ -101,26 +92,13 @@ popd
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}/rhino build/rpmBuild/org.mozilla.rhino.zip
-pushd %{buildroot}%{eclipse_dropin}/rhino/eclipse/plugins/org.mozilla.rhino_1.7.1.%{rhinoqualifier}/lib
+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.xerces_*.jar
-ln -s ../../../../../java/xerces-j2.jar org.apache.xerces_2.9.0.jar
-rm -fr org.apache.xml.serializer_*.jar
-ln -s ../../../../../java/xalan-j2-serializer.jar org.apache.xml.serializer_2.7.1.jar
-rm -fr org.apache.xml.resolver_*.jar
-ln -s ../../../../../java/xml-commons-resolver.jar org.apache.xml.resolver_1.2.0.jar
-rm -fr javax.xml_*.jar
-ln -s ../../../../../java/xml-commons-apis.jar javax.xml_1.3.4.jar
-rm -fr javax.wsdl_*.jar
-ln -s ../../../../../java/wsdl4j.jar javax.wsdl_1.5.0.jar
-rm -fr org.apache.commons.codec_*.jar
-ln -s ../../../../../java/commons-codec.jar org.apache.commons.codec_1.3.0.jar
rm -fr org.apache.batik.bridge_*.jar
ln -s ../../../../../java/batik/batik-bridge.jar
rm -fr org.apache.batik.css_*.jar
@@ -131,27 +109,25 @@ rm -fr org.apache.batik.dom.svg_*.jar
ln -s ../../../../../java/batik/batik-svg-dom.jar
rm -fr org.apache.batik.ext.awt_*.jar
ln -s ../../../../../java/batik/batik-awt-util.jar
-rm -fr org.apache.batik.extension_*.jar
-ln -s ../../../../../java/batik/batik-extension.jar
rm -fr org.apache.batik.parser_*.jar
ln -s ../../../../../java/batik/batik-parser.jar
+rm -fr org.apache.batik.pdf_*.jar
+ln -s ../../../../../java/fop.jar
+ln -s ../../../../../java/sac.jar
rm -fr org.apache.batik.svggen_*.jar
ln -s ../../../../../java/batik/batik-svggen.jar
-rm -fr org.apache.batik.swing_*.jar
-ln -s ../../../../../java/batik/batik-swing.jar
rm -fr org.apache.batik.transcoder_*.jar
ln -s ../../../../../java/batik/batik-transcoder.jar
-rm -fr org.apache.batik.util.gui_*.jar
-ln -s ../../../../../java/batik/batik-gui-util.jar
rm -fr org.apache.batik.util_*.jar
ln -s ../../../../../java/batik/batik-util.jar
+rm -fr org.apache.batik.util.gui_*.jar
+ln -s ../../../../../java/batik/batik-gui-util.jar
rm -fr org.apache.batik.xml_*.jar
ln -s ../../../../../java/batik/batik-xml.jar
rm -fr org.w3c*.jar
ln -s ../../../../../java/xml-commons-apis-ext.jar
-rm -fr org.apache.batik.pdf_*.jar
-ln -s ../../../../../java/fop.jar
-ln -s ../../../../../java/sac.jar
+rm -fr org.apache.commons.codec_*.jar
+ln -s ../../../../../java/commons-codec.jar org.apache.commons.codec_1.3.0.jar
popd
%clean
@@ -160,11 +136,15 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{eclipse_dropin}/birt
-%{eclipse_dropin}/rhino
-%doc features/org.eclipse.birt/license.html
-%doc features/org.eclipse.birt/epl-v10.html
+%doc features/org.eclipse.birt.chart.feature/license.html
+%doc features/org.eclipse.birt.chart.feature/epl-v10.html
%changelog
+* Tue Aug 3 2010 Andrew Overholt <overholt at redhat.com> 2.6.0-1
+- Update to 2.6.0.
+- Build rhino plugin as part of BIRT chart feature.
+- Remove unnecessary dependencies.
+
* Wed Mar 3 2010 Alexander Kurtakov <akurtako at redhat.com> 2.5.2-1
- Update to 2.5.2.
diff --git a/sources b/sources
index 78c9817..337c7f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d18349143ac5d9a8b330f252261a72a9 birt-source-2_5_2.zip
+5ba1e5dd7ef51c0fbe8eb2186d72ba6d eclipse-birt-2.6.0-fetched-src.tar.bz2
More information about the scm-commits
mailing list