rpms/openoffice.org/devel openoffice.org-1.9.115.ooo69368.fixxmlsec.patch, NONE, 1.1 openoffice.org-1.9.115.ooo69368.xmlsec.nss.patch, NONE, 1.1 openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch, NONE, 1.1 openoffice.org.spec, 1.1271, 1.1272 openoffice.org-1.9.115.ooo51931.fixxmlsec.patch, 1.3, NONE openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch, 1.1, NONE openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Aug 23 14:08:03 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27790
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
openoffice.org-1.9.115.ooo69368.xmlsec.nss.patch
openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
Removed Files:
openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
Log Message:
update upstream ids
openoffice.org-1.9.115.ooo69368.fixxmlsec.patch:
--- NEW FILE openoffice.org-1.9.115.ooo69368.fixxmlsec.patch ---
Index: makefile.mk
===================================================================
RCS file: /cvs/external/libxmlsec/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- openoffice.org.orig/libxmlsec/makefile.mk 31 Jan 2006 18:27:29 -0000 1.8
+++ openoffice.org/libxmlsec/makefile.mk 10 Aug 2006 13:55:31 -0000
@@ -157,16 +157,16 @@
OUTDIR2INC=include$/xmlsec
.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libxmlsec1.*dylib src$/nss$/.libs$/libxmlsec1-nss.*dylib
+OUT2LIB+=src$/.libs$/liboldxmlsec1.*dylib src$/nss$/.libs$/liboldxmlsec1-nss.*dylib
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
-OUT2BIN+=src$/.libs$/libxmlsec1-1.dll src$/nss$/.libs$/libxmlsec1-nss-1.dll src$/mscrypto$/.libs$/libxmlsec1-mscrypto-1.dll
+OUT2BIN+=src$/.libs$/liboldxmlsec1-1.dll src$/nss$/.libs$/liboldxmlsec1-nss-1.dll src$/mscrypto$/.libs$/liboldxmlsec1-mscrypto-1.dll
.ELSE
OUT2LIB+=win32$/binaries$/*.lib
OUT2BIN+=win32$/binaries$/*.dll
.ENDIF
.ELSE
-OUT2LIB+=src$/.libs$/libxmlsec1.so* src$/nss$/.libs$/libxmlsec1-nss.so*
+OUT2LIB+=src$/.libs$/liboldxmlsec1.so* src$/nss$/.libs$/liboldxmlsec1-nss.so*
.ENDIF
# --- Targets ------------------------------------------------------
Index: xmlsec1-1.2.6.patch
===================================================================
RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
retrieving revision 1.13
diff -u -r1.13 xmlsec1-1.2.6.patch
--- openoffice.org.orig/libxmlsec/xmlsec1-1.2.6.patch 9 Mar 2006 10:18:52 -0000 1.13
+++ openoffice.org/libxmlsec/xmlsec1-1.2.6.patch 10 Aug 2006 13:55:49 -0000
@@ -14178,3 +14178,348 @@
XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
+*** misc/xmlsec1-1.2.6/src/Makefile.in 2006-08-10 14:25:07.000000000 +0100
+--- misc/build/xmlsec1-1.2.6/src/Makefile.in 2006-08-10 14:26:01.000000000 +0100
+***************
+*** 14,20 ****
+
+ @SET_MAKE@
+
+! SOURCES = $(libxmlsec1_la_SOURCES)
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+--- 14,20 ----
+
+ @SET_MAKE@
+
+! SOURCES = $(liboldxmlsec1_la_SOURCES)
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+***************
+*** 50,59 ****
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+! libxmlsec1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+! am__libxmlsec1_la_SOURCES_DIST = xmlsec-ltdl.c app.c base64.c bn.c \
+ buffer.c c14n.c dl.c enveloped.c errors.c io.c keyinfo.c \
+ keys.c keysdata.c keysmngr.c list.c membuf.c nodeset.c \
+ parser.c soap.c strings.c templates.c transforms.c x509.c \
+--- 50,59 ----
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+! liboldxmlsec1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+! am__liboldxmlsec1_la_SOURCES_DIST = xmlsec-ltdl.c app.c base64.c bn.c \
+ buffer.c c14n.c dl.c enveloped.c errors.c io.c keyinfo.c \
+ keys.c keysdata.c keysmngr.c list.c membuf.c nodeset.c \
+ parser.c soap.c strings.c templates.c transforms.c x509.c \
+***************
+*** 64,76 ****
+ @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE@ $(am__objects_1)
+ @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE at am__objects_2 = \
+ @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE@ $(am__objects_1)
+! am_libxmlsec1_la_OBJECTS = $(am__objects_2) app.lo base64.lo bn.lo \
+ buffer.lo c14n.lo dl.lo enveloped.lo errors.lo io.lo \
+ keyinfo.lo keys.lo keysdata.lo keysmngr.lo list.lo membuf.lo \
+ nodeset.lo parser.lo soap.lo strings.lo templates.lo \
+ transforms.lo x509.lo xkms.lo xmldsig.lo xmlenc.lo xmlsec.lo \
+ xmltree.lo xpath.lo xslt.lo $(am__objects_1)
+! libxmlsec1_la_OBJECTS = $(am_libxmlsec1_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+--- 64,76 ----
+ @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE@ $(am__objects_1)
+ @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE at am__objects_2 = \
+ @XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE@ $(am__objects_1)
+! am_liboldxmlsec1_la_OBJECTS = $(am__objects_2) app.lo base64.lo bn.lo \
+ buffer.lo c14n.lo dl.lo enveloped.lo errors.lo io.lo \
+ keyinfo.lo keys.lo keysdata.lo keysmngr.lo list.lo membuf.lo \
+ nodeset.lo parser.lo soap.lo strings.lo templates.lo \
+ transforms.lo x509.lo xkms.lo xmldsig.lo xmlenc.lo xmlsec.lo \
+ xmltree.lo xpath.lo xslt.lo $(am__objects_1)
+! liboldxmlsec1_la_OBJECTS = $(am_liboldxmlsec1_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+***************
+*** 97,104 ****
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+! SOURCES = $(libxmlsec1_la_SOURCES)
+! DIST_SOURCES = $(am__libxmlsec1_la_SOURCES_DIST)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+--- 97,104 ----
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+! SOURCES = $(liboldxmlsec1_la_SOURCES)
+! DIST_SOURCES = $(am__liboldxmlsec1_la_SOURCES_DIST)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+***************
+*** 347,356 ****
+ $(NULL)
+
+ lib_LTLIBRARIES = \
+! libxmlsec1.la \
+ $(NULL)
+
+! libxmlsec1_la_SOURCES = \
+ $(LTDL_SOURCE_FILES) \
+ app.c \
+ base64.c \
+--- 347,356 ----
+ $(NULL)
+
+ lib_LTLIBRARIES = \
+! liboldxmlsec1.la \
+ $(NULL)
+
+! liboldxmlsec1_la_SOURCES = \
+ $(LTDL_SOURCE_FILES) \
+ app.c \
+ base64.c \
+***************
+*** 383,395 ****
+ xslt.c \
+ $(NULL)
+
+! libxmlsec1_la_LIBADD = \
+ $(LIBXSLT_LIBS) \
+ $(LIBXML_LIBS) \
+ $(XMLSEC_DL_LIBS) \
+ $(NULL)
+
+! libxmlsec1_la_LDFLAGS = \
+ -version-info @XMLSEC_VERSION_INFO@ \
+ $(NULL)
+
+--- 383,395 ----
+ xslt.c \
+ $(NULL)
+
+! liboldxmlsec1_la_LIBADD = \
+ $(LIBXSLT_LIBS) \
+ $(LIBXML_LIBS) \
+ $(XMLSEC_DL_LIBS) \
+ $(NULL)
+
+! liboldxmlsec1_la_LDFLAGS = \
+ -version-info @XMLSEC_VERSION_INFO@ \
+ $(NULL)
+
+***************
+*** 466,473 ****
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+! libxmlsec1.la: $(libxmlsec1_la_OBJECTS) $(libxmlsec1_la_DEPENDENCIES)
+! $(LINK) -rpath $(libdir) $(libxmlsec1_la_LDFLAGS) $(libxmlsec1_la_OBJECTS) $(libxmlsec1_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+--- 466,473 ----
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+! liboldxmlsec1.la: $(liboldxmlsec1_la_OBJECTS) $(liboldxmlsec1_la_DEPENDENCIES)
+! $(LINK) -rpath $(libdir) $(liboldxmlsec1_la_LDFLAGS) $(liboldxmlsec1_la_OBJECTS) $(liboldxmlsec1_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+*** misc/xmlsec1-1.2.6/src/nss/Makefile.in 2004-08-26 08:00:31.000000000 +0200
+--- misc/build/xmlsec1-1.2.6/src/nss/Makefile.in 2006-02-24 17:41:54.977876000 +0100
+***************
+*** 14,20 ****
+
+ @SET_MAKE@
+
+! SOURCES = $(libxmlsec1_nss_la_SOURCES)
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+--- 14,20 ----
+
+ @SET_MAKE@
+
+! SOURCES = $(liboldxmlsec1_nss_la_SOURCES)
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+***************
+*** 50,64 ****
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+! libxmlsec1_nss_la_DEPENDENCIES = ../libxmlsec1.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am__objects_1 =
+! am_libxmlsec1_nss_la_OBJECTS = akmngr.lo app.lo bignum.lo ciphers.lo crypto.lo \
+ digests.lo hmac.lo pkikeys.lo signatures.lo symkeys.lo x509.lo \
+ x509vfy.lo keysstore.lo tokens.lo keytrans.lo keywrapers.lo \
+ $(am__objects_1)
+! libxmlsec1_nss_la_OBJECTS = $(am_libxmlsec1_nss_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+--- 50,64 ----
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+! liboldxmlsec1_nss_la_DEPENDENCIES = ../liboldxmlsec1.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am__objects_1 =
+! am_liboldxmlsec1_nss_la_OBJECTS = akmngr.lo app.lo bignum.lo ciphers.lo crypto.lo \
+ digests.lo hmac.lo pkikeys.lo signatures.lo symkeys.lo x509.lo \
+ x509vfy.lo keysstore.lo tokens.lo keytrans.lo keywrapers.lo \
+ $(am__objects_1)
+! liboldxmlsec1_nss_la_OBJECTS = $(am_liboldxmlsec1_nss_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+***************
+*** 78,85 ****
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+! SOURCES = $(libxmlsec1_nss_la_SOURCES)
+! DIST_SOURCES = $(libxmlsec1_nss_la_SOURCES)
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+--- 78,85 ----
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+! SOURCES = $(liboldxmlsec1_nss_la_SOURCES)
+! DIST_SOURCES = $(liboldxmlsec1_nss_la_SOURCES)
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+***************
+*** 317,326 ****
+ $(NULL)
+
+ lib_LTLIBRARIES = \
+! libxmlsec1-nss.la \
+ $(NULL)
+
+! libxmlsec1_nss_la_SOURCES = \
+ akmngr.c \
+ app.c \
+ bignum.c \
+--- 317,326 ----
+ $(NULL)
+
+ lib_LTLIBRARIES = \
+! liboldxmlsec1-nss.la \
+ $(NULL)
+
+! liboldxmlsec1_nss_la_SOURCES = \
+ akmngr.c \
+ app.c \
+ bignum.c \
+***************
+*** 339,352 ****
+ x509vfy.c \
+ $(NULL)
+
+! libxmlsec1_nss_la_LIBADD = \
+! ../libxmlsec1.la \
+ $(NSS_LIBS) \
+ $(LIBXSLT_LIBS) \
+ $(LIBXML_LIBS) \
+ $(NULL)
+
+! libxmlsec1_nss_la_LDFLAGS = \
+ -version-info @XMLSEC_VERSION_INFO@ \
+ $(NULL)
+
+--- 339,352 ----
+ x509vfy.c \
+ $(NULL)
+
+! liboldxmlsec1_nss_la_LIBADD = \
+! ../liboldxmlsec1.la \
+ $(NSS_LIBS) \
+ $(LIBXSLT_LIBS) \
+ $(LIBXML_LIBS) \
+ $(NULL)
+
+! liboldxmlsec1_nss_la_LDFLAGS = \
+ -version-info @XMLSEC_VERSION_INFO@ \
+ $(NULL)
+
+***************
+*** 410,417 ****
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+! libxmlsec1-nss.la: $(libxmlsec1_nss_la_OBJECTS) $(libxmlsec1_nss_la_DEPENDENCIES)
+! $(LINK) -rpath $(libdir) $(libxmlsec1_nss_la_LDFLAGS) $(libxmlsec1_nss_la_OBJECTS) $(libxmlsec1_nss_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+--- 410,417 ----
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+! liboldxmlsec1-nss.la: $(liboldxmlsec1_nss_la_OBJECTS) $(liboldxmlsec1_nss_la_DEPENDENCIES)
+! $(LINK) -rpath $(libdir) $(liboldxmlsec1_nss_la_LDFLAGS) $(liboldxmlsec1_nss_la_OBJECTS) $(liboldxmlsec1_nss_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+--- build/xmlsec1-1.2.6/configure 2006-08-14 15:55:25.000000000 +0100
++++ misc/build/xmlsec1-1.2.6/configure 2006-08-14 15:56:46.000000000 +0100
+@@ -25769,23 +25769,23 @@
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION" >&5
+-echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" >&5
++echo $ECHO_N "checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
+
+- if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION" ; then
++ if $PKG_CONFIG --exists "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ succeeded=yes
+
+ echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5
+ echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6
+- NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
++ NSS_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
+ echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5
+ echo "${ECHO_T}$NSS_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking NSS_LIBS" >&5
+ echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6
+- NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
++ NSS_LIBS=`$PKG_CONFIG --libs "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
+ echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
+ echo "${ECHO_T}$NSS_LIBS" >&6
+ else
+@@ -25793,7 +25793,7 @@
+ NSS_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+- NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
++ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
+
+ fi
+
Index: source/ooo/file_library_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
retrieving revision 1.202.4.1
diff -u -r1.202.4.1 file_library_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp 27 Jun 2006 07:52:52 -0000 1.202.4.1
+++ openoffice.org/scp2/source/ooo/file_library_ooo.scp 10 Aug 2006 13:41:41 -0000
@@ -2392,9 +2392,9 @@
TXT_FILE_BODY;
#ifdef UNX
#ifdef MACOSX
- Name = STRING(CONCAT2(libxmlsec1.1.2.6,UNXSUFFIX));
+ Name = STRING(CONCAT2(liboldxmlsec1.1.2.6,UNXSUFFIX));
#else
- Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1.2.6));
+ Name = STRING(CONCAT3(liboldxmlsec1,UNXSUFFIX,.1.2.6));
#endif
#else
Name = "libxmlsec.dll";
@@ -2416,9 +2416,9 @@
File gid_File_Lib_LibXMLSec_xmlsecnss
TXT_FILE_BODY;
#ifdef MACOSX
- Name = STRING(CONCAT2(libxmlsec1-nss.1.2.6,UNXSUFFIX));
+ Name = STRING(CONCAT2(liboldxmlsec1-nss.1.2.6,UNXSUFFIX));
#else
- Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.1.2.6));
+ Name = STRING(CONCAT3(liboldxmlsec1-nss,UNXSUFFIX,.1.2.6));
#endif
Dir = gid_Dir_Program;
Styles = (PACKED,PATCH);
Index: source/ooo/shortcut_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/shortcut_ooo.scp,v
retrieving revision 1.20
diff -u -r1.20 shortcut_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/shortcut_ooo.scp 9 Sep 2005 01:42:03 -0000 1.20
+++ openoffice.org/scp2/source/ooo/shortcut_ooo.scp 10 Aug 2006 13:41:41 -0000
@@ -430,9 +430,9 @@
FileID = gid_File_Lib_LibXMLSec_xmlseccore;
Dir = gid_Dir_Program;
#ifdef MACOSX
- Name = STRING(CONCAT2(libxmlsec1.1,UNXSUFFIX));
+ Name = STRING(CONCAT2(liboldxmlsec1.1,UNXSUFFIX));
#else
- Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1));
+ Name = STRING(CONCAT3(liboldxmlsec1,UNXSUFFIX,.1));
#endif
Styles = (NETWORK,RELATIVE);
End
@@ -442,7 +442,7 @@
Shortcut gid_Shortcut_Lib_LibXMLSec_xmlseccore_2
ShortcutID = gid_Shortcut_Lib_LibXMLSec_xmlseccore;
Dir = gid_Dir_Program;
- Name = STRING(CONCAT2(libxmlsec1,UNXSUFFIX));
+ Name = STRING(CONCAT2(liboldxmlsec1,UNXSUFFIX));
Styles = (NETWORK,RELATIVE);
End
#endif
@@ -452,9 +452,9 @@
FileID = gid_File_Lib_LibXMLSec_xmlsecnss;
Dir = gid_Dir_Program;
#ifdef MACOSX
- Name = STRING(CONCAT2(libxmlsec1-nss.1,UNXSUFFIX));
+ Name = STRING(CONCAT2(liboldxmlsec1-nss.1,UNXSUFFIX));
#else
- Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.1));
+ Name = STRING(CONCAT3(liboldxmlsec1-nss,UNXSUFFIX,.1));
#endif
Styles = (NETWORK,RELATIVE);
End
@@ -464,7 +464,7 @@
Shortcut gid_Shortcut_Lib_LibXMLSec_xmlsecnss_2
ShortcutID = gid_Shortcut_Lib_LibXMLSec_xmlsecnss;
Dir = gid_Dir_Program;
- Name = STRING(CONCAT2(libxmlsec1-nss,UNXSUFFIX));
+ Name = STRING(CONCAT2(liboldxmlsec1-nss,UNXSUFFIX));
Styles = (NETWORK,RELATIVE);
End
#endif
Index: inc/libs.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/libs.mk,v
retrieving revision 1.98
diff -u -r1.98 libs.mk
--- openoffice.org.orig/solenv/inc/libs.mk 7 Apr 2006 14:23:23 -0000 1.98
+++ openoffice.org/solenv/inc/libs.mk 10 Aug 2006 13:42:25 -0000
@@ -149,11 +149,11 @@
TKLIB=-ltk$(OFFICEUPD)$(DLLPOSTFIX)
SVTOOLLIB=-lsvt$(OFFICEUPD)$(DLLPOSTFIX)
.IF "$(GUI)$(COM)"=="WNTGCC"
-XMLSECLIB=-lxmlsec1-1
-XMLSECLIB-NSS=-lxmlsec1-nss-1
+XMLSECLIB=-loldxmlsec1-1
+XMLSECLIB-NSS=-loldxmlsec1-nss-1
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
-XMLSECLIB=-lxmlsec1
-XMLSECLIB-NSS=-lxmlsec1-nss
+XMLSECLIB=-loldxmlsec1
+XMLSECLIB-NSS=-loldxmlsec1-nss
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
.IF "$(GUI)$(COM)"=="WNTGCC"
LIBXML2LIB=-lxml2-2
@@ -165,7 +165,7 @@
PLC4LIB=-lplc4
NSSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-NSS) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB)
.IF "$(GUI)$(COM)"=="WNTGCC"
-XMLSECLIB-MS=-lxmlsec1-mscrypto-1
+XMLSECLIB-MS=-loldxmlsec1-mscrypto-1
MSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-MS) $(CRYPT32LIB) $(ADVAPI32LIB)
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
BROOKERLIB=-lbrooker$(OFFICEUPD)$(DLLPOSTFIX)
openoffice.org-1.9.115.ooo69368.xmlsec.nss.patch:
--- NEW FILE openoffice.org-1.9.115.ooo69368.xmlsec.nss.patch ---
--- openoffice.org.orig/libxmlsec/xmlsec1-1.2.6.patch 2007-07-18 14:11:10.000000000 +0200
+++ openoffice.org/libxmlsec/xmlsec1-1.2.6.patch 2007-07-18 14:24:48.000000000 +0200
@@ -20,370 +20,6 @@
*** misc/xmlsec1-1.2.6/configure Thu Aug 26 08:00:34 2004
--- misc/build/xmlsec1-1.2.6/configure Fri May 11 14:47:19 2007
***************
-*** 463,469 ****
- # include <unistd.h>
- #endif"
-
-! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os XMLSEC_VERSION XMLSEC_PACKAGE XMLSEC_VERSION_SAFE XMLSEC_VERSION_MAJOR XMLSEC_VERSION_MINOR XMLSEC_VERSION_SUBMINOR XMLSEC_VERSION_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_!
S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RM CP MV TAR HELP2MAN MAN2HTML U ANSI2KNR INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL PKG_CONFIG_ENABLED PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS LIBXML262_CFLAGS LIBXML262_LIBS LIBXML_CONFIG LIBXML_MIN_VERSION LIBXSLT_CFLAGS LIBXSLT_LIBS XMLSEC_NO_LIBXSLT LIBXSLT_CONFIG LIBXSLT_MIN_VERSION OPENSSL_CFLAGS OPENSSL_LIBS OPENSSL097_CFLAGS OPENSSL097_LIBS XMLSEC_NO_OPENSSL_TRUE XMLSEC_NO_OPENSSL_FALSE XMLSEC_NO_OPENSSL OPENSSL_CRYPTO_LIB OPENSSL_MIN_VERSION GNUTLS_CFLAGS GNUTLS_LIBS XMLSEC_NO_GNUTLS_TRUE XMLSEC_NO_GNUTLS_FALSE XMLSEC_NO_GNUTLS GNUTLS_CRYPTO_LIB GNUTLS_MIN_VERSION NSS_CFLAGS NSS_LIBS XMLSEC_NO_NSS_TRUE XMLSEC_NO_NSS_FALSE XMLSEC_NO_NSS NSS_CRYPTO_LIB NSS_MIN_VERSION NSPR_MIN_VERSION MOZILLA_MIN_VERSION XMLSEC_NO_SHA1_TRUE XMLSEC_NO_SHA1_FALSE XMLSEC_NO_SHA1 XMLSEC_NO_!
RIPEMD160_TRUE XMLSEC_NO_RIPEMD160_FALSE XMLSEC_NO_RIPEMD160 X!
MLSEC_NO
_HMAC_TRUE XMLSEC_NO_HMAC_FALSE XMLSEC_NO_HMAC XMLSEC_NO_DSA_TRUE XMLSEC_NO_DSA_FALSE XMLSEC_NO_DSA XMLSEC_NO_RSA_TRUE XMLSEC_NO_RSA_FALSE XMLSEC_NO_RSA XMLSEC_NO_X509_TRUE XMLSEC_NO_X509_FALSE XMLSEC_NO_X509 XMLSEC_NO_DES_TRUE XMLSEC_NO_DES_FALSE XMLSEC_NO_DES XMLSEC_NO_AES_TRUE XMLSEC_NO_AES_FALSE XMLSEC_NO_AES XMLSEC_NO_XMLDSIG_TRUE XMLSEC_NO_XMLDSIG_FALSE XMLSEC_NO_XMLDSIG XMLSEC_NO_XMLENC_TRUE XMLSEC_NO_XMLENC_FALSE XMLSEC_NO_XMLENC XMLSEC_NO_XKMS_TRUE XMLSEC_NO_XKMS_FALSE XMLSEC_NO_XKMS XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE XMLSEC_NO_CRYPTO_DYNAMIC_LOADING XMLSEC_DL_INCLUDES XMLSEC_DL_LIBS XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING XMLSEC_DOCDIR XMLSEC_STATIC_BINARIES XMLSEC_CORE_CFLAGS XMLSEC_CORE_LIBS XMLSEC_LIBDIR XMLSEC_OPENSSL_CFLAGS XMLSEC_OPENSSL_LIBS XMLSEC_GNUTLS_CFLAGS XMLSEC_GNUTLS_LIBS XMLSEC_NSS_CFLAGS XMLSEC_NSS_LIBS XMLSEC_CFLAGS XMLSE!
C_LIBS XMLSEC_DEFINES XMLSEC_APP_DEFINES XMLSEC_CRYPTO XMLSEC_CRYPTO_LIST XMLSEC_CRYPTO_DISABLED_LIST XMLSEC_CRYPTO_LIB XMLSEC_CRYPTO_CFLAGS XMLSEC_CRYPTO_LIBS XMLSEC_CRYPTO_PC_FILES_LIST LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
---- 463,469 ----
- # include <unistd.h>
- #endif"
-
-! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os XMLSEC_VERSION XMLSEC_PACKAGE XMLSEC_VERSION_SAFE XMLSEC_VERSION_MAJOR XMLSEC_VERSION_MINOR XMLSEC_VERSION_SUBMINOR XMLSEC_VERSION_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_!
S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RM CP MV TAR HELP2MAN MAN2HTML U ANSI2KNR INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL PKG_CONFIG_ENABLED PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS LIBXML262_CFLAGS LIBXML262_LIBS LIBXML_CONFIG LIBXML_MIN_VERSION LIBXSLT_CFLAGS LIBXSLT_LIBS XMLSEC_NO_LIBXSLT LIBXSLT_CONFIG LIBXSLT_MIN_VERSION OPENSSL_CFLAGS OPENSSL_LIBS OPENSSL097_CFLAGS OPENSSL097_LIBS XMLSEC_NO_OPENSSL_TRUE XMLSEC_NO_OPENSSL_FALSE XMLSEC_NO_OPENSSL OPENSSL_CRYPTO_LIB OPENSSL_MIN_VERSION GNUTLS_CFLAGS GNUTLS_LIBS XMLSEC_NO_GNUTLS_TRUE XMLSEC_NO_GNUTLS_FALSE XMLSEC_NO_GNUTLS GNUTLS_CRYPTO_LIB GNUTLS_MIN_VERSION NSS_CFLAGS NSS_LIBS XMLSEC_NO_NSS_TRUE XMLSEC_NO_NSS_FALSE XMLSEC_NO_NSS NSS_CRYPTO_LIB NSS_MIN_VERSION NSPR_MIN_VERSION MOZILLA_MIN_VERSION MSCRYPTO_CFLAGS MSCRYPTO_LIBS XMLSEC_NO_SHA1_TRUE XMLSEC_NO_SHA1_F!
ALSE XMLSEC_NO_SHA1 XMLSEC_NO_RIPEMD160_TRUE XMLSEC_NO_RIPEMD1!
60_FALSE
XMLSEC_NO_RIPEMD160 XMLSEC_NO_HMAC_TRUE XMLSEC_NO_HMAC_FALSE XMLSEC_NO_HMAC XMLSEC_NO_DSA_TRUE XMLSEC_NO_DSA_FALSE XMLSEC_NO_DSA XMLSEC_NO_RSA_TRUE XMLSEC_NO_RSA_FALSE XMLSEC_NO_RSA XMLSEC_NO_X509_TRUE XMLSEC_NO_X509_FALSE XMLSEC_NO_X509 XMLSEC_NO_DES_TRUE XMLSEC_NO_DES_FALSE XMLSEC_NO_DES XMLSEC_NO_AES_TRUE XMLSEC_NO_AES_FALSE XMLSEC_NO_AES XMLSEC_NO_XMLDSIG_TRUE XMLSEC_NO_XMLDSIG_FALSE XMLSEC_NO_XMLDSIG XMLSEC_NO_XMLENC_TRUE XMLSEC_NO_XMLENC_FALSE XMLSEC_NO_XMLENC XMLSEC_NO_XKMS_TRUE XMLSEC_NO_XKMS_FALSE XMLSEC_NO_XKMS XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_TRUE XMLSEC_NO_CRYPTO_DYNAMIC_LOADING_FALSE XMLSEC_NO_CRYPTO_DYNAMIC_LOADING XMLSEC_DL_INCLUDES XMLSEC_DL_LIBS XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_TRUE XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING_FALSE XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING XMLSEC_DOCDIR XMLSEC_STATIC_BINARIES XMLSEC_CORE_CFLAGS XMLSEC_CORE_LIBS XMLSEC_LIBDIR XMLSEC_OPENSSL_CFLAGS XMLSEC_OPENSSL_LIBS XMLSEC_GNUTLS_CFLAGS XMLSEC_GNUTLS_LIBS XMLSEC_NSS_CFLAGS XMLSE!
C_NSS_LIBS XMLSEC_CFLAGS XMLSEC_LIBS XMLSEC_DEFINES XMLSEC_APP_DEFINES XMLSEC_CRYPTO XMLSEC_CRYPTO_LIST XMLSEC_CRYPTO_DISABLED_LIST XMLSEC_CRYPTO_LIB XMLSEC_CRYPTO_CFLAGS XMLSEC_CRYPTO_LIBS XMLSEC_CRYPTO_PC_FILES_LIST LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-***************
-*** 1072,1077 ****
---- 1072,1078 ----
- --with-nss=PFX nss location
- --with-nspr=PFX nspr location (needed for NSS)
- --with-mozilla-ver=VER mozilla version (alt to --with-nss, --with-nspr)
-+ --with-mscrypto try to use mscrypto
- --with-html-dir=PATH path to installed docs
-
- Some influential environment variables:
-***************
-*** 2045,2052 ****
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-! ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-! ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
---- 2046,2053 ----
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-! ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-! ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-***************
-*** 2698,2712 ****
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
-! CFLAGS="-g -O2"
- else
-! CFLAGS="-g"
- fi
- else
- if test "$GCC" = yes; then
-! CFLAGS="-O2"
- else
-! CFLAGS=
- fi
- fi
- echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
---- 2699,2713 ----
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
-! CFLAGS="$ADDCFLAGS -g -O2"
- else
-! CFLAGS="$ADDCFLAGS -g"
- fi
- else
- if test "$GCC" = yes; then
-! CFLAGS="$ADDCFLAGS -O2"
- else
-! CFLAGS="$ADDCFLAGS"
- fi
- fi
- echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-***************
-*** 6350,6360 ****
- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-! beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-! mingw* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic='-DDLL_EXPORT'
---- 6351,6361 ----
- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-! beos* | cygwin* | mingw* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-! pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic='-DDLL_EXPORT'
-***************
-*** 6409,6415 ****
- fi
- ;;
-
-! mingw* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic='-DDLL_EXPORT'
---- 6410,6416 ----
- fi
- ;;
-
-! pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic='-DDLL_EXPORT'
-***************
-*** 6752,6758 ****
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-! archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
---- 6753,6759 ----
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-! archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--exclude-libs,ALL ${wl}--out-implib,$lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-***************
-*** 7778,7784 ****
- ;;
-
- freebsd*)
-! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
---- 7779,7785 ----
- ;;
-
- freebsd*)
-! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-***************
-*** 9046,9052 ****
- ;;
- esac
- output_verbose_link_cmd='echo'
-! archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
---- 9047,9053 ----
- ;;
- esac
- output_verbose_link_cmd='echo'
-! archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name @executable_path/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-***************
-*** 10088,10094 ****
- enable_shared_with_static_runtimes_CXX=yes
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-! archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
---- 10089,10095 ----
- enable_shared_with_static_runtimes_CXX=yes
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-! archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--exclude-libs,ALL ${wl}--out-implib,$lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-***************
-*** 10816,10825 ****
- # like `-m68040'.
- lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
- ;;
[...2260 lines suppressed...]
-+ s, at MAKEINFO@,$MAKEINFO,;t t
-+ s, at AMTAR@,$AMTAR,;t t
-+ s, at install_sh@,$install_sh,;t t
-+ s, at STRIP@,$STRIP,;t t
-+ s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
-+ s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-+ s, at mkdir_p@,$mkdir_p,;t t
-+ s, at AWK@,$AWK,;t t
-+ s, at SET_MAKE@,$SET_MAKE,;t t
-+ s, at am__leading_dot@,$am__leading_dot,;t t
-+ s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-+ s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-+ s, at MAINT@,$MAINT,;t t
-+ s, at CC@,$CC,;t t
-+ s, at CFLAGS@,$CFLAGS,;t t
-+ s, at LDFLAGS@,$LDFLAGS,;t t
-+ s, at CPPFLAGS@,$CPPFLAGS,;t t
-+ s, at ac_ct_CC@,$ac_ct_CC,;t t
-+ s, at EXEEXT@,$EXEEXT,;t t
-+ s, at OBJEXT@,$OBJEXT,;t t
-+ s, at DEPDIR@,$DEPDIR,;t t
-+ s, at am__include@,$am__include,;t t
-+ s, at am__quote@,$am__quote,;t t
-+ s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
-+ s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
-+ s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-+ s, at CCDEPMODE@,$CCDEPMODE,;t t
-+ s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-+ s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-+ s, at EGREP@,$EGREP,;t t
-+ s, at LN_S@,$LN_S,;t t
-+ s, at ECHO@,$ECHO,;t t
-+ s, at AR@,$AR,;t t
-+ s, at ac_ct_AR@,$ac_ct_AR,;t t
-+ s, at RANLIB@,$RANLIB,;t t
-+ s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-+ s, at CPP@,$CPP,;t t
-+ s, at CXX@,$CXX,;t t
-+ s, at CXXFLAGS@,$CXXFLAGS,;t t
-+ s, at ac_ct_CXX@,$ac_ct_CXX,;t t
-+ s, at CXXDEPMODE@,$CXXDEPMODE,;t t
-+ s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-+ s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-+ s, at CXXCPP@,$CXXCPP,;t t
-+ s, at F77@,$F77,;t t
-+ s, at FFLAGS@,$FFLAGS,;t t
-+ s, at ac_ct_F77@,$ac_ct_F77,;t t
-+ s, at LIBTOOL@,$LIBTOOL,;t t
-+ s, at RM@,$RM,;t t
-+ s, at CP@,$CP,;t t
-+ s, at MV@,$MV,;t t
-+ s, at TAR@,$TAR,;t t
-+ s, at HELP2MAN@,$HELP2MAN,;t t
-+ s, at MAN2HTML@,$MAN2HTML,;t t
-+ s, at U@,$U,;t t
-+ s, at ANSI2KNR@,$ANSI2KNR,;t t
-+ s, at INSTALL_LTDL_TRUE@,$INSTALL_LTDL_TRUE,;t t
-+ s, at INSTALL_LTDL_FALSE@,$INSTALL_LTDL_FALSE,;t t
-+ s, at CONVENIENCE_LTDL_TRUE@,$CONVENIENCE_LTDL_TRUE,;t t
-+ s, at CONVENIENCE_LTDL_FALSE@,$CONVENIENCE_LTDL_FALSE,;t t
-+ s, at LIBADD_DL@,$LIBADD_DL,;t t
-+ s, at PKG_CONFIG_ENABLED@,$PKG_CONFIG_ENABLED,;t t
-+ s, at PKG_CONFIG@,$PKG_CONFIG,;t t
-+ s, at LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
-+ s, at LIBXML_LIBS@,$LIBXML_LIBS,;t t
-+ s, at LIBXML262_CFLAGS@,$LIBXML262_CFLAGS,;t t
-+ s, at LIBXML262_LIBS@,$LIBXML262_LIBS,;t t
-+ s, at LIBXML_CONFIG@,$LIBXML_CONFIG,;t t
-+ s, at LIBXML_MIN_VERSION@,$LIBXML_MIN_VERSION,;t t
-+ s, at LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
-+ s, at LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
-+ s, at XMLSEC_NO_LIBXSLT@,$XMLSEC_NO_LIBXSLT,;t t
-+ s, at LIBXSLT_CONFIG@,$LIBXSLT_CONFIG,;t t
-+ s, at LIBXSLT_MIN_VERSION@,$LIBXSLT_MIN_VERSION,;t t
-+ s, at OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
-+ s, at OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
-+ s, at OPENSSL097_CFLAGS@,$OPENSSL097_CFLAGS,;t t
-+ s, at OPENSSL097_LIBS@,$OPENSSL097_LIBS,;t t
-+ s, at XMLSEC_NO_OPENSSL_TRUE@,$XMLSEC_NO_OPENSSL_TRUE,;t t
-+ s, at XMLSEC_NO_OPENSSL_FALSE@,$XMLSEC_NO_OPENSSL_FALSE,;t t
-+ s, at XMLSEC_NO_OPENSSL@,$XMLSEC_NO_OPENSSL,;t t
-+ s, at OPENSSL_CRYPTO_LIB@,$OPENSSL_CRYPTO_LIB,;t t
-+ s, at OPENSSL_MIN_VERSION@,$OPENSSL_MIN_VERSION,;t t
-+ s, at GNUTLS_CFLAGS@,$GNUTLS_CFLAGS,;t t
-+ s, at GNUTLS_LIBS@,$GNUTLS_LIBS,;t t
-+ s, at XMLSEC_NO_GNUTLS_TRUE@,$XMLSEC_NO_GNUTLS_TRUE,;t t
-+ s, at XMLSEC_NO_GNUTLS_FALSE@,$XMLSEC_NO_GNUTLS_FALSE,;t t
-+ s, at XMLSEC_NO_GNUTLS@,$XMLSEC_NO_GNUTLS,;t t
-+ s, at GNUTLS_CRYPTO_LIB@,$GNUTLS_CRYPTO_LIB,;t t
-+ s, at GNUTLS_MIN_VERSION@,$GNUTLS_MIN_VERSION,;t t
-+ s, at NSS_CFLAGS@,$NSS_CFLAGS,;t t
-+ s, at NSS_LIBS@,$NSS_LIBS,;t t
-+ s, at XMLSEC_NO_NSS_TRUE@,$XMLSEC_NO_NSS_TRUE,;t t
-+ s, at XMLSEC_NO_NSS_FALSE@,$XMLSEC_NO_NSS_FALSE,;t t
-+ s, at XMLSEC_NO_NSS@,$XMLSEC_NO_NSS,;t t
-+ s, at NSS_CRYPTO_LIB@,$NSS_CRYPTO_LIB,;t t
-+ s, at NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t
-+ s, at NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t
-+ s, at MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t
-+ s, at MSCRYPTO_CFLAGS@,$MSCRYPTO_CFLAGS,;t t
-+ s, at MSCRYPTO_LIBS@,$MSCRYPTO_LIBS,;t t
- s, at XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t
- s, at XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t
- s, at XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
-***************
-*** 34368,34373 ****
---- 36254,36261 ----
- s, at NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t
- s, at NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t
- s, at MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t
-+ s, at MSCRYPTO_CFLAGS@,$MSCRYPTO_CFLAGS,;t t
-+ s, at MSCRYPTO_LIBS@,$MSCRYPTO_LIBS,;t t
- s, at XMLSEC_NO_SHA1_TRUE@,$XMLSEC_NO_SHA1_TRUE,;t t
- s, at XMLSEC_NO_SHA1_FALSE@,$XMLSEC_NO_SHA1_FALSE,;t t
- s, at XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t
*** misc/xmlsec1-1.2.6/configure.in Thu Aug 26 04:49:24 2004
--- misc/build/xmlsec1-1.2.6/configure.in Fri May 11 14:47:19 2007
***************
@@ -2603,7 +438,7 @@
NSS_FOUND="no"
***************
-*** 521,527 ****
+*** 521,529 ****
AC_MSG_RESULT(no)
NSS_FOUND="without"
elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
@@ -2611,14 +446,25 @@
[NSS_FOUND=yes],
[NSS_FOUND=no])
fi
---- 535,541 ----
+
+ if test "z$NSS_FOUND" = "zno" ; then
+--- 535,550 ----
AC_MSG_RESULT(no)
NSS_FOUND="without"
elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
-! PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION,
+! dnl try system nspr and nss
+! PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION,
[NSS_FOUND=yes],
[NSS_FOUND=no])
++ dnl fallback to the mozilla nspr and nss
++ if test "z$NSS_FOUND" = "zno" ; then
++ PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION,
++ [NSS_FOUND=yes],
++ [NSS_FOUND=no])
++ fi
fi
+
+ if test "z$NSS_FOUND" = "zno" ; then
***************
*** 534,541 ****
ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
@@ -2629,7 +475,7 @@
AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
NSPR_INCLUDES_FOUND="no"
---- 548,555 ----
+--- 555,562 ----
ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
fi
@@ -2647,7 +493,7 @@
dnl do not add -L/usr/lib because compiler does it anyway
if test "z$dir" = "z/usr/lib" ; then
NSPR_LIBS="$NSPR_LIBS_LIST"
---- 584,592 ----
+--- 591,599 ----
done
for dir in $ac_nss_lib_dir ; do
@@ -2666,7 +512,7 @@
done
fi
---- 599,624 ----
+--- 606,631 ----
fi
NSPR_LIBS_FOUND="yes"
break
@@ -2702,7 +548,7 @@
dnl do not add -L/usr/lib because compiler does it anyway
if test "z$dir" = "z/usr/lib" ; then
NSS_LIBS="$NSS_LIBS_LIST"
---- 676,684 ----
+--- 683,691 ----
done
for dir in $ac_nss_lib_dir ; do
@@ -2721,7 +567,7 @@
done
fi
---- 691,716 ----
+--- 698,723 ----
fi
NSS_LIBS_FOUND="yes"
break
openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch:
--- NEW FILE openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch ---
Index: source/gdi/outdev3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v
retrieving revision 1.229
diff -u -r1.229 outdev3.cxx
--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx 3 Jul 2007 14:05:45 -0000 1.229
+++ openoffice.org/vcl/source/gdi/outdev3.cxx 24 Jul 2007 12:18:54 -0000
@@ -7155,6 +7155,7 @@
aFontInfo.SetPitch( rData.mePitch );
aFontInfo.SetWeight( rData.meWeight );
aFontInfo.SetItalic( rData.meItalic );
+ aFontInfo.SetWidthType( rData.meWidthType );
if( rData.IsScalable() )
aFontInfo.mpImplMetric->mnMiscFlags |= ImplFontMetric::SCALABLE_FLAG;
if( rData.mbDevice )
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1271
retrieving revision 1.1272
diff -u -r1.1271 -r1.1272
--- openoffice.org.spec 23 Aug 2007 13:03:42 -0000 1.1271
+++ openoffice.org.spec 23 Aug 2007 14:07:29 -0000 1.1272
@@ -1,6 +1,6 @@
%define oootag OOG680
%define ooomilestone 2
-%define rh_rpm_release 2
+%define rh_rpm_release 3
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -80,7 +80,7 @@
Patch15: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
Patch16: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
Patch17: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch18: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
+Patch18: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
Patch19: openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch
Patch20: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
Patch21: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
@@ -95,41 +95,40 @@
Patch30: openoffice.org-2.0.4.rh217065.syncbackspace.patch
Patch31: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
Patch32: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch33: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch34: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch35: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
-Patch36: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch37: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch38: workspace.tl37.patch
-Patch39: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch40: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch41: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch42: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch43: workspace.configrefactor01.patch
-Patch44: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch45: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch46: openoffice.org-2.2.0.rh232389.tango.patch
-Patch47: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch48: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch49: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch50: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch51: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
-Patch52: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch53: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch54: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch55: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch56: openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
-Patch57: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch58: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch59: workspace.unifysound01.patch
-Patch60: workspace.npower7.patch
-Patch61: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
-Patch62: openoffice.org-2.3.0.ooo80735.cppu.map.patch
-Patch63: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
-Patch64: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch65: workspace.dba23e.patch
-Patch66: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
-Patch67: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
+Patch33: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch34: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
+Patch35: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch36: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch37: workspace.tl37.patch
+Patch38: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch39: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch40: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch41: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch42: workspace.configrefactor01.patch
+Patch43: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch44: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch45: openoffice.org-2.2.0.rh232389.tango.patch
+Patch46: openoffice.org-2.2.0.ooo53397.linkopt.patch
+Patch47: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
+Patch48: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch49: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch50: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
+Patch51: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch52: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch53: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch54: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch55: openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
+Patch56: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch57: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch58: workspace.unifysound01.patch
+Patch59: workspace.npower7.patch
+Patch60: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
+Patch61: openoffice.org-2.3.0.ooo80735.cppu.map.patch
+Patch62: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
+Patch63: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch64: workspace.dba23e.patch
+Patch65: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
+Patch66: openoffice.org-2.3.0.ooo80931.sysui.genericname.patch
%define instdir %{_libdir}/openoffice.org
@@ -1017,7 +1016,7 @@
%patch15 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
%patch16 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
%patch17 -p1 -b .ooo54603.fontconfig.patch
-%patch18 -p1 -b .ooo51931.fixxmlsec.patch
+%patch18 -p1 -b .ooo69368.fixxmlsec.patch
%patch19 -p1 -b .ooo67740.doublefree.xmlhelp.patch
%patch20 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
%patch21 -p1 -b .ooo58606.sw.pre-edit.patch
@@ -1032,45 +1031,44 @@
%patch30 -p1 -b .rh217065.syncbackspace.patch
%patch31 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
%patch32 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch33 -p1 -b .ooo61812.svx.a11ycrash.patch
-cat %{PATCH34} >> svtools/source/dialogs/localize.sdf
-%patch35 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
-%patch36 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch37 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch38 -p1 -b .tl37.patch
-%patch39 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch40 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch41 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch42 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch43 -p0 -b .workspace.configrefactor01.patch
-%patch44 -p0 -b .ooo68717.gstreamer.video.patch
-%patch45 -p1 -b .ooo63159.sal.dtype.patch
-%patch46 -p1 -b .rh232389.tango.patch
+cat %{PATCH33} >> svtools/source/dialogs/localize.sdf
+%patch34 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
+%patch35 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch36 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch37 -p1 -b .tl37.patch
+%patch38 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch39 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch40 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch41 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch42 -p0 -b .workspace.configrefactor01.patch
+%patch43 -p0 -b .ooo68717.gstreamer.video.patch
+%patch44 -p1 -b .ooo63159.sal.dtype.patch
+%patch45 -p1 -b .rh232389.tango.patch
%if %{linkopt}
-%patch47 -p1 -b .ooo53397.linkopt.patch
+%patch46 -p1 -b .ooo53397.linkopt.patch
%endif
-%patch48 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch49 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch50 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch47 -p1 -b .ooo75790.sc.pa-IN.translate.patch
+%patch48 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch49 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
%if %{linkopt}
-%patch51 -p0 -b .ooo77885.stoc.stocmerge.patch
+%patch50 -p0 -b .ooo77885.stoc.stocmerge.patch
%endif
-%patch52 -p1 -b .ooo80816.selinux.bridges.patch
-%patch53 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch54 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch55 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch56 -p1 -b .ooo79878.vcl.honourwidthtype.patch
-%patch57 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH58}
-%patch59 -p1 -b .workspace.unifysound01.patch
-%patch60 -p1 -b .workspace.npower7.patch
-%patch61 -p1 -b .ooo80721.reportdesign.stlportism.patch
-%patch62 -p1 -b .ooo80735.cppu.map.patch
-%patch63 -p1 -b .ooo80944.sd.sixtyfour.patch
-%patch64 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch65 -p1 -b .workspace.dba23e.patch
-%patch66 -p1 -b .ooo80967.ucb.neon27.patch
-%patch67 -p1 -b .ooo80931.sysui.genericname.patch
+%patch51 -p1 -b .ooo80816.selinux.bridges.patch
+%patch52 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch53 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch54 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch55 -p1 -b .ooo80424.vcl.honourwidthtype.patch
+%patch56 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH57}
+%patch58 -p1 -b .workspace.unifysound01.patch
+%patch59 -p1 -b .workspace.npower7.patch
+%patch60 -p1 -b .ooo80721.reportdesign.stlportism.patch
+%patch61 -p1 -b .ooo80735.cppu.map.patch
+%patch62 -p1 -b .ooo80944.sd.sixtyfour.patch
+%patch63 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch64 -p1 -b .workspace.dba23e.patch
+%patch65 -p1 -b .ooo80967.ucb.neon27.patch
+%patch66 -p1 -b .ooo80931.sysui.genericname.patch
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
@@ -2746,6 +2744,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Thu Aug 23 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.3
+- drop integrated openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+
* Wed Aug 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.2
- move vba stuff into calc package
- add workspace.dba23e.patch
--- openoffice.org-1.9.115.ooo51931.fixxmlsec.patch DELETED ---
--- openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch DELETED ---
--- openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch DELETED ---
More information about the fedora-extras-commits
mailing list