rpms/openoffice.org/devel openoffice.org.spec,1.1645,1.1646

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18594

Modified Files:
	openoffice.org.spec 
Log Message:
jfreereport foo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1645
retrieving revision 1.1646
diff -u -r1.1645 -r1.1646
--- openoffice.org.spec	9 Sep 2008 10:21:35 -0000	1.1645
+++ openoffice.org.spec	10 Sep 2008 07:55:27 -0000	1.1646
@@ -64,6 +64,7 @@
 BuildRequires:  mesa-libGLU-devel, redland-devel, ant, ant-apache-regexp
 BuildRequires:  jakarta-commons-codec, jakarta-commons-httpclient
 BuildRequires:  jakarta-commons-lang, poppler-devel
+BuildRequires:  pentaho-reporting-flow-engine
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  openoffice.org-multiliblauncher.sh
@@ -220,6 +221,7 @@
 %package report-builder
 Summary: Create database reports from %{name}
 Group: Applications/Productivity
+Requires: pentaho-reporting-flow-engine
 Requires: %{name}-base-core = %{epoch}:%{version}-%{release}
 
 %description report-builder
@@ -1317,10 +1319,7 @@
  --enable-minimizer --enable-presenter-console --enable-pdfimport \
  --enable-wiki-publisher --enable-report-builder --enable-vba \
  --with-vba-package-format="builtin" --with-system-libs \
- --with-system-headers --with-system-apache-commons \
- --with-commons-logging-jar=/usr/share/java/commons-logging.jar \
- --with-lucene-core-jar=/usr/share/java/lucene.jar \
- --with-lucene-analyzers-jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar \
+ --with-system-headers --with-system-jfreereport --with-system-apache-commons \
  --with-system-mozilla --with-system-libtextcat --with-system-redland \
  --with-system-dicts --with-external-dict-dir=/usr/share/myspell \
  --without-myspell-dicts --without-system-mspack --without-fonts --without-gpc \
@@ -1483,18 +1482,30 @@
 cd ../../
 
 # unpack report-builder extension
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/sun-report-builder.oxt
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
 unzip solver/%{OFFICEUPD}/unxlng*/bin/sun-report-builder.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
+pushd $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
+ln -sf %{_datadir}/java/flute.jar flute-1.3-jfree-20061107.jar
+ln -sf %{_datadir}/java/jcommon.jar jcommon-1.0.10.jar
+ln -sf %{_datadir}/java/jcommon-serializer.jar jcommon-serializer-0.2.0.jar
+ln -sf %{_datadir}/java/libfonts.jar libfonts-0.3.3.jar
+ln -sf %{_datadir}/java/libformula.jar libformula-0.1.14.jar
+ln -sf %{_datadir}/java/liblayout.jar liblayout-0.2.8.jar
+ln -sf %{_datadir}/java/libloader.jar libloader-0.3.6.jar
+ln -sf %{_datadir}/java/librepository.jar librepository-0.1.4.jar
+ln -sf %{_datadir}/java/libxml.jar libxml-0.9.9.jar
+ln -sf %{_datadir}/java/pentaho-reporting-flow-engine.jar pentaho-reporting-flow-engine-0.9.2.jar
+ln -sf %{_datadir}/java/sac.jar sac.jar
+popd
 
 # unpack wiki-publisher extension
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/wiki-publisher.oxt
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
 unzip solver/%{OFFICEUPD}/unxlng*/bin/swext/wiki-publisher.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
 pushd $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
-rm -rf commons-*.jar
-ln -s /usr/share/java/commons-codec.jar commons-codec-1.3.jar
-ln -s /usr/share/java/commons-httpclient.jar commons-httpclient-3.1.jar
-ln -s /usr/share/java/commons-lang.jar commons-lang-2.3.jar
-ln -s /usr/share/java/commons-logging.jar commons-logging-1.1.1.jar
+ln -sf %{_datadir}/java/commons-codec.jar commons-codec-1.3.jar
+ln -sf %{_datadir}/java/commons-httpclient.jar commons-httpclient-3.1.jar
+ln -sf %{_datadir}/java/commons-lang.jar commons-lang-2.3.jar
+ln -sf %{_datadir}/java/commons-logging.jar commons-logging-1.1.1.jar
 popd
 
 # unpack presentation-minimizer extension