rpms/openoffice.org/FC-4 openoffice.org-2.0.1.ooo57545.xmerge.xalan.patch, NONE, 1.1 openoffice.org.spec, 1.218, 1.219
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Nov 21 12:41:42 UTC 2005
- Previous message (by thread): rpms/udev/devel udevstart2.patch, NONE, 1.1 start_udev, 1.43, 1.44 udev.rules, 1.45, 1.46 udev.spec, 1.125, 1.126
- Next message (by thread): rpms/bc/devel bc.spec,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7082
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.0.1.ooo57545.xmerge.xalan.patch
Log Message:
xmerge doesn't actually xalan
openoffice.org-2.0.1.ooo57545.xmerge.xalan.patch:
source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java | 0
source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java | 0
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java | 6 ------
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java | 5 -----
4 files changed, 11 deletions(-)
--- NEW FILE openoffice.org-2.0.1.ooo57545.xmerge.xalan.patch ---
Index: source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
===================================================================
RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v
retrieving revision 1.2
diff -u -r1.2 DocumentDeserializerImpl.java
--- openoffice.org.orig/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java 24 Oct 2005 18:12:55 -0000 1.2
+++ openoffice.org/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java 21 Nov 2005 11:02:25 -0000
@@ -90,12 +90,6 @@
import javax.xml.transform.URIResolver;
import javax.xml.transform.Source;
-
-//
-//import org.apache.xalan.serialize.Serializer;
-//import org.apache.xalan.serialize.SerializerFactory;
-//import org.apache.xalan.templates.OutputProperties;
-
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
Index: source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
===================================================================
RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java,v
retrieving revision 1.2
diff -u -r1.2 DocumentSerializerImpl.java
--- openoffice.org.orig/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java 24 Oct 2005 18:13:19 -0000 1.2
+++ openoffice.org/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java 21 Nov 2005 11:02:25 -0000
@@ -89,11 +89,6 @@
import javax.xml.transform.URIResolver;
import javax.xml.transform.Source;
-//
-import org.apache.xalan.serialize.Serializer;
-import org.apache.xalan.serialize.SerializerFactory;
-import org.apache.xalan.templates.OutputProperties;
-
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- openoffice.org.spec 21 Nov 2005 09:17:10 -0000 1.218
+++ openoffice.org.spec 21 Nov 2005 12:41:40 -0000 1.219
@@ -192,6 +192,7 @@
Patch39: openoffice.org-2.0.1.oooXXXXX.extensions.openldapapi.patch
Patch40: openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch
Patch41: openoffice.org-2.0.1.gccXXXXX.bridges.brokengcj.patch
+Patch42: openoffice.org-2.0.1.ooo57545.xmerge.xalan.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -846,6 +847,7 @@
%patch39 -p1 -b .oooXXXXX.extensions.openldapapi.patch
%patch40 -p1 -b .oooXXXXX.m400.buildissues.patch
%patch41 -p1 -b .gccXXXXX.bridges.brokengcj.patch
+%patch42 -p1 -b .ooo57545.xmerge.xalan.patch
%if %{includingexternals}
#start ludicrous workaround
- Previous message (by thread): rpms/udev/devel udevstart2.patch, NONE, 1.1 start_udev, 1.43, 1.44 udev.rules, 1.45, 1.46 udev.spec, 1.125, 1.126
- Next message (by thread): rpms/bc/devel bc.spec,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list