rpms/openoffice.org/devel workspace.cmcfixes67.patch, NONE, 1.1 openoffice.org.spec, 1.2081, 1.2082 workspace.ause109.patch, 1.1, 1.2 openoffice.org-3.2.0.oooxxxxx.fixdbcheck.patch, 1.1, NONE

Caolan McNamara caolanm at fedoraproject.org
Tue Nov 24 13:25:40 UTC 2009 

Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.ause109.patch 
Added Files:
	workspace.cmcfixes67.patch 
Removed Files:
	openoffice.org-3.2.0.oooxxxxx.fixdbcheck.patch 
Log Message:
push fixes upstream

workspace.cmcfixes67.patch:
 a/transex3/source/help/MANIFEST.MF           |    2 
 configure.in                                 |  112 ++++++++++++++++-----------
 transex3/source/help/makefile.mk             |   19 ----
 ucb/source/ucp/gio/gio_mount.cxx             |    2 
 xmlhelp/source/com/sun/star/help/MANIFEST.MF |    1 
 xmlhelp/source/com/sun/star/help/makefile.mk |   12 --
 6 files changed, 73 insertions(+), 75 deletions(-)

--- NEW FILE workspace.cmcfixes67.patch ---
diff -r dd90334f8680 configure.in
--- a/configure.in	Mon Nov 16 21:01:44 2009 +0100
+++ b/configure.in	Tue Nov 24 13:21:57 2009 +0000
@@ -2974,7 +2974,7 @@
         AC_MSG_RESULT([checked (ecj)])
         #TODO: what's to do here? some switch to do 1.5 compiling?
         JAVAFLAGS="-source 1.5 -target 1.5"
-        _gij_longver="50000"
+        _gij_longver="40200"
     fi
 fi
 
@@ -3029,7 +3029,7 @@
 if test "$SOLAR_JAVA" != ""; then
     dnl first check if we have been asked to autodetect JAVA_HOME with a recent gij
     if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
-      if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
+      if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
         cat > findhome.java <<_ACEOF
 [import java.io.File;
 
@@ -3069,7 +3069,7 @@
     fi
 
     dnl second sanity check JAVA_HOME if possible
-    if test "$JDK" != "gcj" -o "$_gij_longver" -ge "50000"; then
+    if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
       # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
       if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
 
@@ -3843,25 +3843,14 @@
         ], []
     )
     AC_MSG_CHECKING([whether db is at least 4.1])
-    for v in `seq 1 7`; do
-       AC_TRY_RUN([
+    AC_TRY_RUN([
 #include <db.h>
 
 int main(int argc, char **argv) {
-       if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0;
+       if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
        else return 1;
 }
-       ], [DB_VERSION_MINOR=$v], [])
-    done
-    if test "$DB_VERSION_MINOR" -gt "1"; then
-       AC_MSG_RESULT([OK])
-       DB_VERSION=4.$DB_VERSION_MINOR
-    else
-       AC_MSG_ERROR([no. you need at least db 4.1])
-    fi
-    # does not work :/
-    #AC_CHECK_LIB(db, db_create, [],
-    #  [AC_MSG_ERROR([db library not installed or functional])], [])
+    ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
     AC_HAVE_LIBRARY(db, [],
       [AC_MSG_ERROR([db not installed or functional])], [])
     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
@@ -5925,37 +5914,74 @@
 if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
   AC_MSG_CHECKING([which Apache commons-* libs to use])
   if test "$with_system_apache_commons" = "yes"; then
-       SYSTEM_APACHE_COMMONS=YES
-       AC_MSG_RESULT([external])
+    SYSTEM_APACHE_COMMONS=YES
+    AC_MSG_RESULT([external])
     if test "$ENABLE_MEDIAWIKI" = "YES"; then
-        if test -z "$COMMONS_CODEC_JAR"; then
-                COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
-        fi
-   AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
-        [AC_MSG_ERROR(commons-codec.jar not found.)], [])
-        if test -z "$COMMONS_LANG_JAR"; then
-                COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
-        fi
-   AC_CHECK_FILE($COMMONS_LANG_JAR, [],
-        [AC_MSG_ERROR(commons-lang.jar not found.)], [])
-        if test -z "$COMMONS_HTTPCLIENT_JAR"; then
-                COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
-        fi
-   AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
-        [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+      if test -z $COMMONS_CODEC_JAR; then
+        AC_CHECK_FILE(/usr/share/java/commons-codec-1.3.jar, 
+          [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar ],
+          [
+            AC_CHECK_FILE(/usr/share/java/commons-codec.jar, 
+              [ COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar ],
+              [AC_MSG_ERROR(commons-codec.jar replacement not found.)]
+            )
+          ]
+        )
+      else
+        AC_CHECK_FILE($COMMONS_CODEC_JAR, [],
+             [AC_MSG_ERROR(commons-codec.jar not found.)], [])
+      fi
+
+      if test -z $COMMONS_LANG_JAR; then
+        AC_CHECK_FILE(/usr/share/java/commons-lang-2.3.jar, 
+          [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar ],
+          [
+            AC_CHECK_FILE(/usr/share/java/commons-lang.jar, 
+              [ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
+              [AC_MSG_ERROR(commons-lang.jar replacement not found.)]
+            )
+          ]
+        )
+      else
+        AC_CHECK_FILE($COMMONS_LANG_JAR, [],
+             [AC_MSG_ERROR(commons-lang.jar not found.)], [])
+      fi
+
+      if test -z $COMMONS_HTTPCLIENT_JAR; then
+        AC_CHECK_FILE(/usr/share/java/commons-httpclient-3.1.jar, 
+          [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar ],
+          [
+            AC_CHECK_FILE(/usr/share/java/commons-httpclient.jar, 
+              [ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar ],
+              [AC_MSG_ERROR(commons-httpclient.jar replacement not found.)]
+            )
+          ]
+        )
+      else
+        AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
+             [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+      fi
     fi
     if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
-        if test -z "$COMMONS_LOGGING_JAR"; then
-                COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
-        fi
-   AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
-        [AC_MSG_ERROR(commons-logging.jar not found.)], [])
-
+      if test -z $COMMONS_LOGGING_JAR; then
+        AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar, 
+          [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ],
+          [
+            AC_CHECK_FILE(/usr/share/java/commons-logging.jar, 
+              [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
+              [AC_MSG_ERROR(commons-logging.jar replacement not found.)]
+            )
+          ]
+        )
+      else
+        AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
+             [AC_MSG_ERROR(commons-logging.jar not found.)], [])
+      fi
     fi
   else
-        AC_MSG_RESULT([internal])
-        SYSTEM_APACHE_COMMONS=NO
-        BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
+    AC_MSG_RESULT([internal])
+    SYSTEM_APACHE_COMMONS=NO
+    BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
   fi
 fi
 AC_SUBST(SYSTEM_APACHE_COMMONS)
diff -r dd90334f8680 transex3/source/help/MANIFEST.MF
--- a/transex3/source/help/MANIFEST.MF	Mon Nov 16 21:01:44 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-RegistrationClassName: com.sun.star.help.HelpComponent
-Class-Path: lucene-core-2.3.jar lucene-analyzers-2.3.jar
diff -r dd90334f8680 transex3/source/help/makefile.mk
--- a/transex3/source/help/makefile.mk	Mon Nov 16 21:01:44 2009 +0100
+++ b/transex3/source/help/makefile.mk	Tue Nov 24 13:21:57 2009 +0000
@@ -104,36 +104,17 @@
 	$(CLASSDIR)$/$(PACKAGE)$/HelpIndexerTool.class			        \
 	$(CLASSDIR)$/$(PACKAGE)$/HelpFileDocument.class
 
-
-#	$(CLASSDIR)$/$(PACKAGE)$/HelpSearch.class			        \
-#	$(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class			        \
-#	$(CLASSDIR)$/$(PACKAGE)$/HelpComponent.class			        \
-#	$(CLASSDIR)$/$(PACKAGE)$/HelpFileDocument.class
-
-#JARFILES  = ridl.jar jurt.jar unoil.jar juh.jar
 .IF "$(SYSTEM_LUCENE)" == "YES"
 CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
-COMP=fix_system_lucene
 .ELSE
 JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar
 .ENDIF
 JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
-#JAVAFILES = $(JAVACLASSFILES) 
 
 JARCLASSDIRS	   = $(PACKAGE)/*
 JARTARGET	       = HelpIndexerTool.jar
 JARCOMPRESS        = TRUE 
-#CUSTOMMANIFESTFILE = MANIFEST.MF 
  
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(JARTARGETN)"!=""
-$(JARTARGETN) : $(COMP)
-.ENDIF
-
-fix_system_lucene:
-	@echo "Fix Java Class-Path entry for Lucene libraries from system."
-	@$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
-    -i ../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
diff -r dd90334f8680 ucb/source/ucp/gio/gio_mount.cxx
--- a/ucb/source/ucp/gio/gio_mount.cxx	Mon Nov 16 21:01:44 2009 +0100
+++ b/ucb/source/ucp/gio/gio_mount.cxx	Tue Nov 24 13:21:57 2009 +0000
@@ -68,7 +68,7 @@
 using namespace com::sun::star;
 
 static void ooo_mount_operation_ask_password (GMountOperation *op,
-    const char *message, const char *default_user, 
+    const char * /*message*/, const char *default_user, 
     const char *default_domain, GAskPasswordFlags flags)
 {
     uno::Reference< task::XInteractionHandler > xIH;
diff -r dd90334f8680 xmlhelp/source/com/sun/star/help/MANIFEST.MF
--- a/xmlhelp/source/com/sun/star/help/MANIFEST.MF	Mon Nov 16 21:01:44 2009 +0100
+++ b/xmlhelp/source/com/sun/star/help/MANIFEST.MF	Tue Nov 24 13:21:57 2009 +0000
@@ -1,2 +1,1 @@
 RegistrationClassName: com.sun.star.help.HelpComponent
-Class-Path: lucene-core-2.3.jar lucene-analyzers-2.3.jar
diff -r dd90334f8680 xmlhelp/source/com/sun/star/help/makefile.mk
--- a/xmlhelp/source/com/sun/star/help/makefile.mk	Mon Nov 16 21:01:44 2009 +0100
+++ b/xmlhelp/source/com/sun/star/help/makefile.mk	Tue Nov 24 13:21:57 2009 +0000
@@ -76,14 +76,15 @@
 JARFILES  = ridl.jar jurt.jar unoil.jar juh.jar 
 .IF "$(SYSTEM_LUCENE)" == "YES"
 XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
-COMP=fix_system_lucene
+JARCLASSPATH = file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)
 .ELSE
 JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar
+JARCLASSPATH = lucene-core-2.3.jar lucene-analyzers-2.3.jar
 .ENDIF
   
 JARTARGET	   	   = LuceneHelpWrapper.jar
 JARCOMPRESS        = TRUE 
-CUSTOMMANIFESTFILE = MANIFEST.MF 
+CUSTOMMANIFESTFILE = MANIFEST.MF
  
 # --- Targets ------------------------------------------------------
 
@@ -94,15 +95,8 @@
 .IF "$(JARTARGETN)"!=""
 $(JAVATARGET) : $(ADDFILES)
 $(JARTARGETN) : $(ADDFILES)
-$(JARTARGETN) : $(COMP)
 .ENDIF
 
 $(CLASSDIR)$/$(PACKAGE)$/%.class : $(SOLARBINDIR)$/help$/$(PACKAGE)$/%.class 
 	$(MKDIRHIER) $(@:d)	
 	$(COPY) $< $@
-
-
-fix_system_lucene:
-	@echo "Fix Java Class-Path entry for Lucene libraries from system."
-	@$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
-	-i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2081
retrieving revision 1.2082
diff -u -p -r1.2081 -r1.2082
--- openoffice.org.spec	23 Nov 2009 11:36:16 -0000	1.2081
+++ openoffice.org.spec	24 Nov 2009 13:25:40 -0000	1.2082
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 5
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -128,7 +128,7 @@ Patch50: workspace.fwk125.patch
 Patch51: workspace.impress183.patch
 Patch52: workspace.hb33patches1.patch
 Patch53: workspace.ause109.patch
-Patch54: openoffice.org-3.2.0.oooxxxxx.fixdbcheck.patch
+Patch54: workspace.cmcfixes67.patch
 Patch55: workspace.srb1.patch
 Patch56: openoffice.org-3.1.1.ooo107131.impress.tabledrag.crash
 Patch57: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
@@ -1653,7 +1653,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch51 -p0 -b .workspace.impress183.patch
 %patch52 -p0 -b .workspace.hb33patches1.patch
 %patch53 -p0 -b .workspace.ause109.patch
-%patch54 -p0 -b .fixdbcheck.patch
+%patch54 -p1 -b .workspace.cmcfixes67.patch
 %patch55 -p1 -b .workspace.srb1.patch
 %patch56 -p0 -b .ooo107131.impress.tabledrag.crash
 %patch57 -p0 -b .ooo107137.canvas.fixcolorspace.patch
@@ -1672,8 +1672,6 @@ autoconf
  --enable-minimizer --enable-presenter-console --enable-pdfimport \
  --enable-wiki-publisher --enable-vba --enable-report-builder \
  --with-system-jfreereport \
- --with-commons-logging-jar=/usr/share/java/commons-logging.jar \
- --with-commons-codec-jar=/usr/share/java/commons-codec.jar \
  --with-vba-package-format="builtin" --with-system-libs \
  --with-system-headers --with-system-apache-commons \
  --with-system-mozilla --with-system-libtextcat --with-system-redland \
@@ -4165,6 +4163,9 @@ fi
 %endif
 
 %changelog
+* Tue Nov 24 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-53
+- stick fixups upstream
+
 * Mon Nov 23 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-5.2
 - Resolves: rhbz#540379/ooo#107131 impress tabledrag crash
 - Resolves: rhbz#540231 add openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch

workspace.ause109.patch:
 makefile.mk |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Index: workspace.ause109.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.ause109.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.ause109.patch	17 Nov 2009 21:16:39 -0000	1.1
+++ workspace.ause109.patch	24 Nov 2009 13:25:40 -0000	1.2
@@ -20,21 +20,3 @@
  .IF "$(SYSTEM_LUCENE)" == "YES"
  XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
  COMP=fix_system_lucene
-@@ -96,6 +92,7 @@
- ALLTAR : $(ADDFILES)
- 
- .IF "$(JARTARGETN)"!=""
-+$(JAVATARGET) : $(ADDFILES)
- $(JARTARGETN) : $(ADDFILES)
- $(JARTARGETN) : $(COMP)
- .ENDIF
-@@ -105,7 +102,7 @@
- 	$(COPY) $< $@
- 
- 
--fix_system_lucene:
-+fix_system_lucene: $(JARMANIFEST)
- 	@echo "Fix Java Class-Path entry for Lucene libraries from system."
- 	@$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
--	-i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
-+	-i $<


--- openoffice.org-3.2.0.oooxxxxx.fixdbcheck.patch DELETED ---

More information about the fedora-extras-commits mailing list