rpms/openoffice.org/devel openoffice.org-1.9.115.ooo51931.systemxmlsec.patch, NONE, 1.1 openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch, 1.1, 1.2 openoffice.org.spec, 1.301, 1.302 openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch, 1.2, NONE openoffice.org-1.9.116.rhXXXXX.desktop.noexpand.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jul 14 08:08:45 UTC 2005 

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31931

Modified Files:
	openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.115.ooo51931.systemxmlsec.patch 
Removed Files:
	openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch 
	openoffice.org-1.9.116.rhXXXXX.desktop.noexpand.patch 
Log Message:
cleanup

openoffice.org-1.9.115.ooo51931.systemxmlsec.patch:
 config_office/configure.in                                    |   22 
 config_office/set_soenv.in                                    |    1 
 openoffice.org/xmlsecurity/source/xmlsec/nss/systemxmlsec.cxx | 1836 ++++++++++
 openoffice.org/xmlsecurity/source/xmlsec/nss/systemxmlsec.hxx |  238 +
 scp2/source/ooo/file_library_ooo.scp                          |    2 
 scp2/source/ooo/makefile.mk                                   |    4 
 scp2/source/ooo/shortcut_ooo.scp                              |    2 
 source/ooo/file_library_ooo.scp                               |    0 
 source/ooo/makefile.mk                                        |    0 
 source/ooo/shortcut_ooo.scp                                   |    0 
 source/xmlsec/makefile.mk                                     |    0 
 source/xmlsec/nss/makefile.mk                                 |    0 
 source/xmlsec/nss/securityenvironment_nssimpl.cxx             |    0 
 xmlsecurity/source/xmlsec/makefile.mk                         |    5 
 xmlsecurity/source/xmlsec/nss/makefile.mk                     |   10 
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |    4 
 16 files changed, 2122 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-1.9.115.ooo51931.systemxmlsec.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.126
diff -u -p -r1.126 configure.in
--- openoffice.org.orig/config_office/configure.in	21 Jun 2005 10:13:47 -0000	1.126
+++ openoffice.org/config_office/configure.in	8 Jul 2005 11:13:49 -0000
@@ -248,6 +248,9 @@ AC_ARG_WITH(system-myspell,
 AC_ARG_WITH(system-mythes,
 [  --with-system-mythes    Use mythes already on system
 ],,)
+AC_ARG_WITH(system-xmlsec,
+[  --with-system-xmlsec    Use xmlsec1 already on system
+],,)
 AC_ARG_WITH(system-altlinuxhyph,
 [  --with-system-altlinuxhyph    Use ALTLinuxhyph already on system
 ],,)
@@ -2415,11 +2418,10 @@ if test -n "$with_system_libxml" -o -n "
     AC_MSG_RESULT([external])
     SYSTEM_LIBXML=YES
     PKG_CHECK_MODULES( LIBXML, libxml-2.0 >= 2.0 )
-    BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBXML=NO
-    BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC"
+    BUILD_TYPE="$BUILD_TYPE LIBXML2"
 fi
 AC_SUBST(SYSTEM_LIBXML)
 AC_SUBST(LIBXML_CFLAGS)
@@ -3084,6 +3086,22 @@ AC_SUBST(NEON_LIBS)
 AC_SUBST(NEON_CFLAGS)
 
 dnl ===================================================================
+dnl Check for system xmlsec1
+dnl ===================================================================
+AC_MSG_CHECKING([which xmlsec1 to use])
+if test -n "$with_system_xmlsec" -o -n "$with_system_libs" && \
+	test "$with_system_xmlsec" != "no"; then
+        AC_MSG_RESULT([external])
+        PKG_CHECK_MODULES(XMLSEC, xmlsec1-nss >= 1.2.8)
+        SYSTEM_XMLSEC=YES
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_XMLSEC=NO
+    BUILD_TYPE="$BUILD_TYPE LIBXMSEC"
+fi
+AC_SUBST(SYSTEM_XMLSEC)
+
+dnl ===================================================================
 dnl Check for system myspell
 dnl ===================================================================
 AC_MSG_CHECKING([which myspell to use])
Index: set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.68
diff -u -p -r1.68 set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in	20 Jun 2005 15:18:00 -0000	1.68
+++ openoffice.org/config_office/set_soenv.in	8 Jul 2005 11:13:50 -0000
@@ -1755,6 +1755,7 @@ ToFile( "MYSPELL_CFLAGS",    "@MYSPELL_C
 ToFile( "MYSPELL_LIBS",      "@MYSPELL_LIBS@",     "e" );
 ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
 ToFile( "SYSTEM_MYTHES",     "@SYSTEM_MYTHES@",    "e" );
+ToFile( "SYSTEM_XMLSEC",     "@SYSTEM_XMLSEC@",    "e" );
 ToFile( "PAM_LINK",          "@PAM_LINK@",         "e" );
 ToFile( "CRYPT_LINK",        "@CRYPT_LINK@",       "e" );
 ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@", "e" );
Index: source/ooo/file_library_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
retrieving revision 1.107
diff -u -p -r1.107 file_library_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp	17 Jun 2005 09:33:15 -0000	1.107
+++ openoffice.org/scp2/source/ooo/file_library_ooo.scp	8 Jul 2005 20:34:24 -0000
@@ -2196,6 +2196,7 @@ File gid_File_Lib_XSec_XMLSecurity
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
+#ifndef SYSTEM_XMLSEC
 File gid_File_Lib_LibXMLSec_xmlseccore
     TXT_FILE_BODY;
     #ifdef UNX
@@ -2232,6 +2233,7 @@ File gid_File_Lib_LibXMLSec_xmlsecnss
     Styles = (PACKED);
 End
 #endif
+#endif
 //i20156 - end
 #endif
 
Index: source/ooo/makefile.mk
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/makefile.mk,v
retrieving revision 1.33
diff -u -p -r1.33 makefile.mk
--- openoffice.org.orig/scp2/source/ooo/makefile.mk	17 Jun 2005 14:14:51 -0000	1.33
+++ openoffice.org/scp2/source/ooo/makefile.mk	8 Jul 2005 20:34:25 -0000
@@ -158,6 +158,10 @@ SCPDEFS+=-DSYSTEM_PORTAUDIO
 SCPDEFS+=-DSYSTEM_MYSPELL
 .ENDIF
 
+.IF "$(SYSTEM_XMLSEC)" == "YES"
+SCPDEFS+=-DSYSTEM_XMLSEC
+.ENDIF
+
 SCPDEFS+=\
     -DICU_MAJOR=$(ICU_MAJOR) \
     -DICU_MINOR=$(ICU_MINOR) \
Index: source/ooo/shortcut_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/shortcut_ooo.scp,v
retrieving revision 1.18
diff -u -p -r1.18 shortcut_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/shortcut_ooo.scp	15 Jun 2005 10:27:53 -0000	1.18
+++ openoffice.org/scp2/source/ooo/shortcut_ooo.scp	8 Jul 2005 20:34:26 -0000
@@ -447,6 +447,7 @@ End
 
 //i38417
 #ifndef WITHOUT_MOZILLA
+#ifndef SYSTEM_XMLSEC
 #ifdef UNX
 Shortcut gid_Shortcut_Lib_LibXMLSec_xmlseccore
     FileID = gid_File_Lib_LibXMLSec_xmlseccore;
@@ -483,6 +484,7 @@ Shortcut gid_Shortcut_Lib_LibXMLSec_xmls
 End
 #endif
 #endif
+#endif
 //i38417 -end-
 
 
Index: source/xmlsec/makefile.mk
===================================================================
RCS file: /cvs/xml/xmlsecurity/source/xmlsec/makefile.mk,v
retrieving revision 1.7
diff -u -p -r1.7 makefile.mk
--- openoffice.org.orig/xmlsecurity/source/xmlsec/makefile.mk	30 Mar 2005 11:36:18 -0000	1.7
+++ openoffice.org/xmlsecurity/source/xmlsec/makefile.mk	8 Jul 2005 10:58:48 -0000
@@ -78,6 +78,11 @@ ENABLE_EXCEPTIONS = TRUE
 CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
 .ENDIF
 
+.IF "$(SYSTEM_XMLSEC)" != ""
+PKGCONFIG_MODULES=xmlsec1
+.INCLUDE: pkg_config.mk
+.ENDIF
+
 .IF "$(CRYPTO_ENGINE)" == "mscrypto"
 CDEFS += -DXMLSEC_CRYPTO_MSCRYPTO -DXMLSEC_NO_XSLT
 .ELSE
Index: source/xmlsec/nss/makefile.mk
===================================================================
RCS file: /cvs/xml/xmlsecurity/source/xmlsec/nss/makefile.mk,v
retrieving revision 1.5
diff -u -p -r1.5 makefile.mk
--- openoffice.org.orig/xmlsecurity/source/xmlsec/nss/makefile.mk	18 May 2005 09:58:04 -0000	1.5
+++ openoffice.org/xmlsecurity/source/xmlsec/nss/makefile.mk	8 Jul 2005 10:58:48 -0000
@@ -89,6 +89,12 @@ LIBTARGET=NO
 	@echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity/nss"
 .ENDIF
 
+.IF "$(SYSTEM_XMLSEC)" != ""
+PKGCONFIG_MODULES=xmlsec1
+.INCLUDE: pkg_config.mk
+CFLAGS+=-DSYSTEM_XMLSEC
+.ENDIF
+
 .IF "$(SYSTEM_MOZILLA)" != "YES"
 MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
 NSS_INC = $(MOZ_INC)$/nss
@@ -167,6 +173,10 @@ SLOFILES = \
 	$(SLO)$/seinitializer_nssimpl.obj \
 	$(SLO)$/xsec_nss.obj
 
+.IF "$(SYSTEM_XMLSEC)" != ""
+	SLOFILES+=\
+	$(SLO)$/systemxmlsec.obj
+.ENDIF
 	
 .ENDIF
 
Index: source/xmlsec/nss/securityenvironment_nssimpl.cxx
===================================================================
RCS file: /cvs/xml/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx,v
retrieving revision 1.12
diff -u -p -r1.12 securityenvironment_nssimpl.cxx
--- openoffice.org.orig/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx	18 May 2005 09:58:37 -0000	1.12
+++ openoffice.org/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx	8 Jul 2005 10:58:48 -0000
@@ -89,6 +89,10 @@
 #include <xmlsec/base64.h>
 #include <xmlsec/strings.h>
 
+#ifdef SYSTEM_XMLSEC
+#include "systemxmlsec.hxx"
+#endif
+
 #include <tools/string.hxx>
 
[...1881 lines suppressed...]
+	xmlSecAssert2( xmlSecKeyDataCheckSize( data, xmlSecNssSymKeyDataSize ), -1 ) ;
+	xmlSecAssert2( symkey != NULL, -1 ) ;
+
+	context = xmlSecNssSymKeyDataGetCtx( data ) ;
+	xmlSecAssert2(context != NULL, -1);
+
+	context->cipher = PK11_GetMechanism( symkey ) ;
+
+	if( context->slot != NULL ) {
+		PK11_FreeSlot( context->slot ) ;
+		context->slot = NULL ;
+	}
+	context->slot = PK11_GetSlotFromKey( symkey ) ;
+
+	if( context->symkey != NULL ) {
+		PK11_FreeSymKey( context->symkey ) ;
+		context->symkey = NULL ;
+	}
+	context->symkey = PK11_ReferenceSymKey( symkey ) ;
+
+	return 0 ;
+}
+
+
+
+
+int
+xmlSecNssSlotAdopt(
+	PK11SlotInfo* slot,
+	CK_MECHANISM_TYPE type
+) {
+	xmlSecNssKeySlotPtr		keySlot ;
+	xmlSecSize				ksSize ;
+	xmlSecSize				ksPos ;
+	char					flag ;
+
+	xmlSecAssert2( _xmlSecNssKeySlotList != NULL, -1 ) ;
+	xmlSecAssert2( slot != NULL, -1 ) ;
+
+	ksSize = xmlSecPtrListGetSize( _xmlSecNssKeySlotList ) ;
+
+	/*-
+	 * Firstly, checking whether the slot is in the repository already.
+	 */
+	flag = 0 ;
+	for( ksPos = 0 ; ksPos < ksSize ; ksPos ++ ) {
+		keySlot = ( xmlSecNssKeySlotPtr )xmlSecPtrListGetItem( _xmlSecNssKeySlotList, ksPos ) ;
+		/* If find the slot in the list */
+		if( keySlot != NULL && xmlSecNssKeySlotGetSlot( keySlot ) == slot ) {
+			/* If mechnism type is valid, bind the slot with the mechanism */
+			if( type != CKM_INVALID_MECHANISM ) {
+				if( xmlSecNssKeySlotEnableMech( keySlot, type ) < 0 ) {
+					xmlSecError( XMLSEC_ERRORS_HERE ,
+						NULL ,
+						NULL ,
+						XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+						XMLSEC_ERRORS_NO_MESSAGE ) ;
+					return(-1);
+				}
+			}
+
+			flag = 1 ;
+		}
+	}
+
+	/* If the slot do not in the list, add a new item to the list */
+	if( flag == 0 ) {
+		/* Create a new KeySlot */
+		keySlot = xmlSecNssKeySlotCreate() ;
+		if( keySlot == NULL ) {
+			xmlSecError( XMLSEC_ERRORS_HERE ,
+				NULL ,
+				NULL ,
+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+				XMLSEC_ERRORS_NO_MESSAGE ) ;
+			return(-1);
+		}
+
+		/* Initialize the keySlot with a slot */
+		if( xmlSecNssKeySlotInitialize( keySlot, slot ) < 0 ) {
+			xmlSecError( XMLSEC_ERRORS_HERE ,
+				NULL ,
+				NULL ,
+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+				XMLSEC_ERRORS_NO_MESSAGE ) ;
+			xmlSecNssKeySlotDestroy( keySlot ) ;
+			return(-1);
+		}
+
+		/* If mechnism type is valid, bind the slot with the mechanism */
+		if( type != CKM_INVALID_MECHANISM ) {
+			if( xmlSecNssKeySlotEnableMech( keySlot, type ) < 0 ) {
+				xmlSecError( XMLSEC_ERRORS_HERE ,
+					NULL ,
+					NULL ,
+					XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+					XMLSEC_ERRORS_NO_MESSAGE ) ;
+				xmlSecNssKeySlotDestroy( keySlot ) ;
+				return(-1);
+			}
+		}
+
+		/* Add keySlot into the list */
+		if( xmlSecPtrListAdd( _xmlSecNssKeySlotList, keySlot ) < 0 ) {
+			xmlSecError( XMLSEC_ERRORS_HERE ,
+				NULL ,
+				NULL ,
+				XMLSEC_ERRORS_R_XMLSEC_FAILED ,
+				XMLSEC_ERRORS_NO_MESSAGE ) ;
+			xmlSecNssKeySlotDestroy( keySlot ) ;
+			return(-1);
+		}
+	}
+
+	return(0);
+   }
+
+xmlSecKeyDataPtr xmlSecNssSymKeyDataKeyAdopt(
+    PK11SymKey*     symKey
+) {
+	xmlSecKeyDataPtr	data = NULL ;
+	CK_MECHANISM_TYPE	mechanism = CKM_INVALID_MECHANISM ;
+
+	xmlSecAssert2( symKey != NULL , NULL ) ;
+
+	mechanism = PK11_GetMechanism( symKey ) ;
+	switch( mechanism ) {
+		case CKM_DES3_KEY_GEN :
+		case CKM_DES3_CBC :
+		case CKM_DES3_MAC :
+			data = xmlSecKeyDataCreate( xmlSecNssKeyDataDesId ) ;
+			if( data == NULL ) {
+				xmlSecError( XMLSEC_ERRORS_HERE ,
+					NULL ,
+					"xmlSecKeyDataCreate" ,
+					XMLSEC_ERRORS_R_CRYPTO_FAILED ,
+					"xmlSecNssKeyDataDesId" ) ;
+				return NULL ;
+			}
+			break ;
+		case CKM_AES_KEY_GEN :
+		case CKM_AES_CBC :
+		case CKM_AES_MAC :
+			data = xmlSecKeyDataCreate( xmlSecNssKeyDataAesId ) ;
+			if( data == NULL ) {
+				xmlSecError( XMLSEC_ERRORS_HERE ,
+					NULL ,
+					"xmlSecKeyDataCreate" ,
+					XMLSEC_ERRORS_R_CRYPTO_FAILED ,
+					"xmlSecNssKeyDataDesId" ) ;
+				return NULL ;
+			}
+			break ;
+		default :
+			xmlSecError( XMLSEC_ERRORS_HERE ,
+				NULL ,
+				NULL ,
+				XMLSEC_ERRORS_R_CRYPTO_FAILED ,
+				"Unsupported mechanism" ) ;
+			return NULL ;
+	}
+
+	if( xmlSecNssSymKeyDataAdoptKey( data , symKey ) < 0 ) {
+		xmlSecError( XMLSEC_ERRORS_HERE ,
+			NULL ,
+			"xmlSecNssSymKeyDataAdoptKey" ,
+			XMLSEC_ERRORS_R_CRYPTO_FAILED ,
+			XMLSEC_ERRORS_NO_MESSAGE ) ;
+
+		xmlSecKeyDataDestroy( data ) ;
+		return NULL ;
+	}
+
+	return data ;
+}
+
+static int
+xmlSecNssSymKeyDataKlassCheck(xmlSecKeyDataKlass* klass) {
+#ifndef XMLSEC_NO_DES
+    if(klass == xmlSecNssKeyDataDesId) {
+    return(1);
+    }
+#endif /* XMLSEC_NO_DES */
+
+#ifndef XMLSEC_NO_AES
+    if(klass == xmlSecNssKeyDataAesId) {
+    return(1);
+    }
+#endif /* XMLSEC_NO_AES */
+
+#ifndef XMLSEC_NO_HMAC
+    if(klass == xmlSecNssKeyDataHmacId) {
+    return(1);
+    }
+#endif /* XMLSEC_NO_HMAC */
+
+    return(0);
+}
+
+}

openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch:
 desktop/scripts/soffice.sh                               |    1 +
 officecfg/registry/data/org/openoffice/Office/Common.xcu |    2 +-
 registry/data/org/openoffice/Office/Common.xcu           |    0 
 scripts/soffice.sh                                       |    0 
 4 files changed, 2 insertions(+), 1 deletion(-)

Index: openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch	5 Apr 2005 17:11:59 -0000	1.1
+++ openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch	14 Jul 2005 08:08:42 -0000	1.2
@@ -14,3 +14,18 @@
      </prop>
    </node>
  </oor:component-data>
+Index: scripts/soffice.sh
+===================================================================
+RCS file: /cvs/framework/desktop/scripts/soffice.sh,v
+retrieving revision 1.17
+diff -u -p -u -r1.17 soffice.sh
+--- openoffice.org.orig/desktop/scripts/soffice.sh	15 Jun 2005 08:16:47 -0000	1.17
++++ openoffice.org/desktop/scripts/soffice.sh	11 Jul 2005 14:16:21 -0000
+@@ -64,6 +64,7 @@
+ SAL_ENABLE_FILE_LOCKING=1
+ export SAL_ENABLE_FILE_LOCKING
+ 
++export SAL_NOEXPANDFPICKER=TRUE
+ # the following test is needed on Linux PPC with IBM j2sdk142
+ if [ `uname -s` = "Linux" -a  "`uname -m`" = "ppc" ] ; then
+     JITC_PROCESSOR_TYPE=6


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- openoffice.org.spec	13 Jul 2005 18:54:22 -0000	1.301
+++ openoffice.org.spec	14 Jul 2005 08:08:42 -0000	1.302
@@ -120,17 +120,16 @@
 Patch51: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
 Patch52: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
 Patch53: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
-Patch54: openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch
+Patch54: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
 Patch55: openoffice.org-1.9.115.ooo51745.cpputools.patch
 Patch56: openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
 Patch57: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
 Patch58: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
-Patch59: openoffice.org-1.9.116.rhXXXXX.desktop.noexpand.patch
-Patch60: workspace.impress63.patch
-Patch61: openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch
-Patch62: openoffice.org-1.9.114.oooXXXXX.systemboost.patch
-Patch63: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
-Patch64: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
+Patch59: workspace.impress63.patch
+Patch60: openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch
+Patch61: openoffice.org-1.9.114.oooXXXXX.systemboost.patch
+Patch62: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+Patch63: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -764,17 +763,18 @@
 %patch51 -p1 -b .ooo51673.printing.checkerror.patch
 %patch52 -p1 -b .ooo51735.audio.withoutnas.patch
 %patch53 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
-%patch54 -p1 -b .oooXXXXX.systemxmlsec.patch
+%patch54 -p1 -b .ooo51931.systemxmlsec.patch
 %patch55 -p1 -b .ooo51745.cpputools.patch
 %patch56 -p1 -b .ooo51755.scp2.parallel.patch
 %patch57 -p1 -b .ooo51774.rsc.parallel.patch
+%if %{build_fc5}
 %patch58 -p1 -b .oooXXXXX.extensions.evolution.patch
-%patch59 -p1 -b .rhXXXXX.desktop.noexpand.patch
-%patch60 -p1 -b .workspace.impress63.patch
-%patch61 -p1 -b .rh162935.gccXXXXX.weirdcrash.patch
-%patch62 -p1 -b .oooXXXXX.systemboost.patch
-%patch63 -p1 -b .rh163147.thorndale.fontconfig.patch
-%patch64 -p1 -b .ooo51912.nullpointer.wizards.patch
+%endif
+%patch59 -p1 -b .workspace.impress63.patch
+%patch60 -p1 -b .rh162935.gccXXXXX.weirdcrash.patch
+%patch61 -p1 -b .oooXXXXX.systemboost.patch
+%patch62 -p1 -b .rh163147.thorndale.fontconfig.patch
+%patch63 -p1 -b .ooo51912.nullpointer.wizards.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/db4 then this needs to be modified/dropped


--- openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch DELETED ---


--- openoffice.org-1.9.116.rhXXXXX.desktop.noexpand.patch DELETED ---

More information about the fedora-cvs-commits mailing list