rpms/openoffice.org/devel openoffice.org-2.0.1.ooo57545.xmerge.xalan.patch, NONE, 1.1 openoffice.org.spec, 1.556, 1.557

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.1.ooo57545.xmerge.xalan.patch 
Log Message:
minor duping

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/devel/openoffice.org.spec,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -r1.556 -r1.557
--- openoffice.org.spec	21 Nov 2005 09:56:17 -0000	1.556
+++ openoffice.org.spec	21 Nov 2005 16:22:54 -0000	1.557
@@ -191,6 +191,7 @@
 Patch38: workspace.jaxpapi.patch
 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.ooo57545.xmerge.xalan.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -844,6 +845,7 @@
 %patch38 -p1 -b .workspace.jaxpapi.patch
 %patch39 -p1 -b .oooXXXXX.extensions.openldapapi.patch
 %patch40 -p1 -b .oooXXXXX.m400.buildissues.patch
+%patch41 -p1 -b .ooo57545.xmerge.xalan.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -2823,9 +2825,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu
 %{instdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
 %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_database_filters.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc
 %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_database_others.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
 %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_database_types.xcu
 %{_bindir}/oobase
 %dir %{_datadir}/applications