rpms/openoffice.org/devel openoffice.org.spec,1.1848,1.1849

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
butcher things to get report-builder building


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1848
retrieving revision 1.1849
diff -u -r1.1848 -r1.1849
--- openoffice.org.spec	5 Mar 2009 10:09:49 -0000	1.1848
+++ openoffice.org.spec	5 Mar 2009 14:33:19 -0000	1.1849
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 4
-%define rh_rpm_release 2
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -1621,17 +1621,21 @@
  --enable-evolution2 --enable-cairo --enable-dbus --enable-opengl \
  --enable-minimizer --enable-presenter-console --enable-pdfimport \
  --enable-wiki-publisher --enable-vba --enable-report-builder \
- --with-jfreereport-jar=/usr/share/java/pentaho-reporting-flow-engine.jar \
- --with-libserializer-jar=/usr/share/java/jcommon-serializer.jar \
- --with-libbase-jar=/dev/null \
  --with-vba-package-format="builtin" --with-system-libs \
- --with-system-headers --with-system-jfreereport --with-system-apache-commons \
+ --with-system-headers --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 \
  --without-agg --without-ppds --without-afms --without-writer2latex \
  %{stlflags} --with-lang="%{langpack_langs}" \
  --with-poor-help-localizations="$POORHELPS"
+
+# awaiting review of libbase
+# --with-system-jfreereport
+# --with-jfreereport-jar=/usr/share/java/pentaho-reporting-flow-engine.jar \
+# --with-libserializer-jar=/usr/share/java/jcommon-serializer.jar \
+# --with-libbase-jar=/dev/null \
+
 ./bootstrap
 source ./Linux*Env.Set.sh
 #unneccessary to build for both hash types
@@ -4114,15 +4118,13 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Mar 05 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-4.2
-- Resolves: rhbz#488688 / ooo#98746 merge Punjabi Translations
-- Resolves: rhbz#488700 / ooo#99907 merge Malayalam Translations
-
 * Thu Mar 05 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-4.1
+- report-builder will be broken until rhbz#474391 is resolved
 - drop integrated workspace.gfbcrash.patch
 - drop integrated workspace.ooo31gsl2.patch
 - drop integrated openoffice.org-3.1.0.ooo98465.sw.fix-doctables.patch
-- report-builder will be broken until rhbz#474391 is resolved
+- Resolves: rhbz#488688 / ooo#98746 merge Punjabi Translations
+- Resolves: rhbz#488700 / ooo#99907 merge Malayalam Translations
 
 * Tue Mar 03 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-3.4
 - Resolves: rhbz#488228 Assamese Translations