[eclipse-birt/f17] Move chart to eclipse-birt-chart subpackage.& Remove unnecessary dependencies provided by platform.

Krzysztof Daniel kdaniel at fedoraproject.org
Tue Apr 17 12:28:48 UTC 2012


commit 711a8186d983274aa2da39e34a7b779811a472aa
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Tue Apr 17 14:22:28 2012 +0200

    Move chart to eclipse-birt-chart subpackage.& Remove unnecessary
    dependencies provided by platform.

 .gitignore        |    1 +
 eclipse-birt.spec |   40 ++++++++++++++++++++++------------------
 2 files changed, 23 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f88fd8..1992bda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ eclipse-birt-3.7.0-fetched-src.tar.bz2
 /eclipse-birt-3.7.1
 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
diff --git a/eclipse-birt.spec b/eclipse-birt.spec
index 37d867c..4ca7483 100644
--- a/eclipse-birt.spec
+++ b/eclipse-birt.spec
@@ -1,4 +1,3 @@
-%global eclipse_base     %{_libdir}/eclipse
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
 
 # Match the context qualifier with the upstream p2 repo
@@ -14,7 +13,7 @@
 
 Name:      eclipse-birt
 Version:   4.2.0
-Release:   0.1.M6%{?dist}
+Release:   0.2.M6%{?dist}
 Summary:   Eclipse-based reporting system
 Group:     System Environment/Libraries
 License:   EPL
@@ -81,6 +80,17 @@ a report designer based on Eclipse, and a runtime component that you
 can add to your app server. BIRT also offers a charting engine that lets 
 you add charts to your own application. 
 
+%package chart
+Summary:   Eclipse-based reporting system, the chart component
+Obsoletes: eclipse-birt <= 4.2.0-0.1
+
+%description chart
+BIRT is an Eclipse-based open source reporting system for web applications,
+especially those based on Java and J2EE. BIRT has two main components: 
+a report designer based on Eclipse, and a runtime component that you 
+can add to your app server. BIRT also offers a charting engine that lets 
+you add charts to your own application.
+
 %prep
 # FIXME remove M6 when 4.2.0 goes GA
 %setup -q -n %{name}-%{version}-M6
@@ -96,9 +106,7 @@ find -name "*.jar" -exec rm {} \;
 # symlink orbit deps
 mkdir orbitDeps
 pushd orbitDeps
-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 
 ln -s %{_javadir}/batik/batik-dom.jar 
 ln -s %{_javadir}/batik/batik-svg-dom.jar
 ln -s %{_javadir}/batik/batik-awt-util.jar 
@@ -107,12 +115,9 @@ ln -s %{_javadir}/batik/batik-parser.jar
 ln -s %{_javadir}/batik/batik-svggen.jar 
 ln -s %{_javadir}/batik/batik-swing.jar 
 ln -s %{_javadir}/batik/batik-transcoder.jar
-ln -s %{_javadir}/batik/batik-gui-util.jar 
-ln -s %{_javadir}/batik/batik-util.jar 
 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
 
@@ -135,8 +140,7 @@ unzip -q -o -d %{buildroot}%{eclipse_dropin}/birt build/rpmBuild/org.eclipse.bir
 pushd %{buildroot}%{eclipse_dropin}/birt/eclipse/plugins
 rm -fr org.apache.batik.bridge_*.jar
 ln -s ../../../../../java/batik/batik-bridge.jar
-rm -fr org.apache.batik.css_*.jar
-ln -s ../../../../../java/batik/batik-css.jar 
+rm -fr org.apache.batik.css_*.jar 
 rm -fr org.apache.batik.dom_*.jar
 ln -s ../../../../../java/batik/batik-dom.jar 
 rm -fr org.apache.batik.dom.svg_*.jar
@@ -147,27 +151,23 @@ 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.transcoder_*.jar
 ln -s ../../../../../java/batik/batik-transcoder.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.util_*.jar 
+rm -fr org.apache.batik.util.gui_*.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.commons.codec_*.jar
-ln -s ../../../../../java/commons-codec.jar org.apache.commons.codec_1.3.0.jar
+rm -fr org.mozilla.javascript_*.jar
+ln -s ../../../../../java/js.jar
 popd
 
-%clean
-rm -rf %{buildroot}
 
-%files
+%files chart
 %defattr(-,root,root,-)
 %{eclipse_dropin}/birt
 %doc org.eclipse.birt.chart.feature/license.html
@@ -176,6 +176,10 @@ rm -rf %{buildroot}
 %doc org.eclipse.birt.data.fedora.feature/epl-v10.html
 
 %changelog
+* Tue Apr 17 2012 Krzysztof Daniel <kdaniel at redhat.com> 4.2.0-0.2.M6
+- Move chart to eclipse-birt-chart subpackage.
+- Remove unnecessary dependencies provided by platform.
+
 * Mon Apr 9 2012 Andrew Overholt <overholt at redhat.com> 4.2.0-0.1.M6
 - Update to 4.2.0 M6.
 


More information about the scm-commits mailing list