rpms/openoffice.org/devel workspace.cmcfixes50.patch,1.2,1.3

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	workspace.cmcfixes50.patch 
Log Message:
fuzz

workspace.cmcfixes50.patch:

Index: workspace.cmcfixes50.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes50.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.cmcfixes50.patch	15 Sep 2008 22:18:05 -0000	1.2
+++ workspace.cmcfixes50.patch	16 Sep 2008 07:39:00 -0000	1.3
@@ -211,7 +211,7 @@
 diff -u -r1.290 -r1.285.8.4
 --- openoffice.org.orig/config_office/configure.in	8 Sep 2008 07:38:40 -0000	1.290
 +++ openoffice.org/config_office/configure.in	9 Sep 2008 08:04:45 -0000	1.285.8.4
-@@ -441,6 +441,10 @@
+@@ -438,6 +438,10 @@
  [  --with-liblayout-jar=JARFILE   Specify path to jarfile manually ],
  [ LIBLAYOUT_JAR="$withval"
  ])
@@ -222,7 +222,7 @@
  AC_ARG_WITH(libformula-jar,
  [  --with-libformula-jar=JARFILE   Specify path to jarfile manually ],
  [ LIBFORMULA_JAR="$withval"
-@@ -3675,15 +3679,34 @@
+@@ -3660,15 +3664,34 @@
          AC_MSG_RESULT([external])
          SYSTEM_LUCENE=YES
          if test -z $LUCENE_CORE_JAR; then
@@ -263,7 +263,7 @@
  else
      AC_MSG_RESULT([internal])
      SYSTEM_LUCENE=NO
-@@ -5359,23 +5382,33 @@
+@@ -5453,23 +5476,33 @@
  	if test -z "$COMMONS_CODEC_JAR"; then
  		COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
  	fi
@@ -308,7 +308,7 @@
    else
  	AC_MSG_RESULT([internal])
    	SYSTEM_APACHE_COMMONS=NO
-@@ -5419,62 +5452,163 @@
+@@ -5519,62 +5552,163 @@
    AC_MSG_CHECKING([which jfreereport libs to use])
    if test "$with_system_jfreereport" == "yes"; then
     	SYSTEM_JFREEREPORT=YES
@@ -517,4 +517,4 @@
 +
    else
       AC_MSG_RESULT([internal])
-      SYSTEM_JFREEREPORT=NO
+      AC_MSG_CHECKING([for jfreereport module])