rpms/openoffice.org/devel openoffice.org-1.9.112.ooo51724.testtools.patch, NONE, 1.1 openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch, NONE, 1.1 openoffice.org.spec, 1.285, 1.286 openoffice.org-1.9.112.oooXXXXX.testtools.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jul 8 15:57:55 UTC 2005
- Previous message (by thread): rpms/parted/devel parted-1.6.23-aix.patch, NONE, 1.1 parted-1.6.23-dasd.patch, NONE, 1.1 parted-1.6.23.tar.gz.sig, NONE, 1.1 .cvsignore, 1.19, 1.20 parted.spec, 1.50, 1.51 sources, 1.23, 1.24 parted-1.6.21-dasd.patch, 1.2, NONE parted-1.6.22-mac-lvm.patch, 1.1, NONE parted-1.6.22-mac-parts.patch, 1.2, NONE parted-1.6.22.tar.gz.sig, 1.1, NONE parted-1.6.3-aix.patch, 1.3, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.spec,1.286,1.287
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13761
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-1.9.112.ooo51724.testtools.patch
openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch
Removed Files:
openoffice.org-1.9.112.oooXXXXX.testtools.patch
Log Message:
try system xmlsec
openoffice.org-1.9.112.ooo51724.testtools.patch:
source/bridgetest/makefile.mk | 0
testtools/source/bridgetest/makefile.mk | 2 ++
2 files changed, 2 insertions(+)
--- NEW FILE openoffice.org-1.9.112.ooo51724.testtools.patch ---
Index: source/bridgetest/makefile.mk
===================================================================
RCS file: /cvs/udk/testtools/source/bridgetest/makefile.mk,v
retrieving revision 1.21
diff -u -p -r1.21 makefile.mk
--- openoffice.org.orig/testtools/source/bridgetest/makefile.mk 17 Jun 2005 09:42:46 -0000 1.21
+++ openoffice.org/testtools/source/bridgetest/makefile.mk 27 Jun 2005 12:20:00 -0000
@@ -201,6 +201,8 @@ MY_JARS=java_uno.jar ridl.jar jurt.jar j
MY_CLASSPATH_TMP=$(foreach,i,$(MY_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(XCLASSPATH)
MY_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))$(PATH_SEPERATOR)..$/class
+.EXPORT : CLASSPATH
+
# Use "127.0.0.1" instead of "localhost", see #i32281#:
$(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk
-rm -f $@
openoffice.org-1.9.115.oooXXXXX.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 | 4
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, 2124 insertions(+), 2 deletions(-)
--- NEW FILE openoffice.org-1.9.115.oooXXXXX.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 10:51:20 -0000
@@ -2160,6 +2160,7 @@ SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMed
#endif
#ifndef WITHOUT_MOZILLA
+#ifndef SYSTEM_XMLSEC
File gid_File_Lib_XSec_Framework
TXT_FILE_BODY;
#ifdef UNX
@@ -2183,6 +2184,7 @@ File gid_File_Lib_XSec_XmlSec
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
+#endif
File gid_File_Lib_XSec_XMLSecurity
TXT_FILE_BODY;
@@ -2196,6 +2198,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 +2235,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 10:51:21 -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 10:51:22 -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
[...1897 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);
+}
+
+}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- openoffice.org.spec 8 Jul 2005 11:25:41 -0000 1.285
+++ openoffice.org.spec 8 Jul 2005 15:57:51 -0000 1.286
@@ -23,9 +23,11 @@
%if %{build_fc4}
%define release_extension .1.0.fc4
+%define systemxmlsec = --without-system-xmlsec
%endif
%if %{build_fc5}
%define release_extension .2.0.fc5
+%define systemxmlsec = --with-system-xmlsec
%endif
ExclusiveArch: %{ix86} ppc
@@ -59,6 +61,9 @@
BuildRequires: libidn-devel, startup-notification-devel, libwpd-devel >= 0.8.0
BuildRequires: desktop-file-utils >= 0.9, libjpeg-devel, pam-devel, tcsh
BuildRequires: perl-Archive-Zip, evolution-data-server-devel, libxslt >= 1.1.14
+%if %{build_fc5}
+BuildRequires: xmlsec1-nss-devel >= 1.2.8-2
+%endif
Patch0: openoffice.org-1.9.80.NONE.skipuselessmodules.patch
Patch1: openoffice.org-1.9.71s1.noregisterwizard.patch
@@ -104,7 +109,7 @@
Patch41: openoffice.org-1.9.110.oooXXXXX.psprintfriend.patch
Patch42: openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
Patch43: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
-Patch44: openoffice.org-1.9.112.oooXXXXX.testtools.patch
+Patch44: openoffice.org-1.9.112.ooo51724.testtools.patch
Patch45: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
Patch46: openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch
Patch47: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
@@ -116,6 +121,7 @@
Patch53: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
Patch54: openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch
Patch55: openoffice.org-1.9.115.oooXXXXX.xsltproc.evenwithjava.patch
+Patch56: openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -739,7 +745,7 @@
%patch41 -p1 -b .oooXXXXX.psprintfriend.patch
%patch42 -p1 -b .ooo51091.exportgcjsymbolname.jvmaccess.patch
%patch43 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
-%patch44 -p1 -b .oooXXXXX.testtools.patch
+%patch44 -p1 -b .ooo51724.testtools.patch
%patch45 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
%patch46 -p1 -b .ooo43430.cvskk.np_sdk.patch
%patch47 -p1 -b .ooo51385.bridges.stack.patch
@@ -751,6 +757,7 @@
%patch53 -p1 -b .ooo51673.printing.checkerror.patch
%patch54 -p1 -b .oooXXXXX.audio.withoutnas.patch
%patch55 -p1 -b .oooXXXXX.xsltproc.evenwithjava.patch
+%patch56 -p1 -b .oooXXXXX.systemxmlsec.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
@@ -783,7 +790,7 @@
fi
cd config_office
autoconf
-%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --enable-xsltproc --disable-fontooo --disable-pasf --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas --without-stlport4 %{withlang}
+%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --enable-xsltproc --disable-fontooo --disable-pasf --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas --without-stlport4 %{systemxmlsec} %{withlang}
cd ..
./bootstrap
source Linux*Env.Set.sh
@@ -2158,7 +2165,9 @@
%{instdir}/program/libxcr680*.so
%{instdir}/program/libxmlfa680*.so
%{instdir}/program/libxmlfd680*.so
+%if %{build_fc4}
%{instdir}/program/libxmlsec*
+%endif
%{instdir}/program/libxmx680*.so
%{instdir}/program/libxo680*.so
%{instdir}/program/libxof680*.so
@@ -2927,6 +2936,10 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Fri Jul 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.115-3
+- in rawhide we should be able to use system-xmlsec1 now with
+ system-xmlsec patch
+
* Thu Jul 07 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.115-2
- add openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch
and disable worthless nas/portaudio/sndfile stuff
--- openoffice.org-1.9.112.oooXXXXX.testtools.patch DELETED ---
- Previous message (by thread): rpms/parted/devel parted-1.6.23-aix.patch, NONE, 1.1 parted-1.6.23-dasd.patch, NONE, 1.1 parted-1.6.23.tar.gz.sig, NONE, 1.1 .cvsignore, 1.19, 1.20 parted.spec, 1.50, 1.51 sources, 1.23, 1.24 parted-1.6.21-dasd.patch, 1.2, NONE parted-1.6.22-mac-lvm.patch, 1.1, NONE parted-1.6.22-mac-parts.patch, 1.2, NONE parted-1.6.22.tar.gz.sig, 1.1, NONE parted-1.6.3-aix.patch, 1.3, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.spec,1.286,1.287
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list