rpms/openoffice.org/devel openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch, NONE, 1.1 openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch, NONE, 1.1 openoffice.org.spec, 1.179, 1.180

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch 
	openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch 
Log Message:
more help, gcj workarounds

openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch:
 com/sun/star/wizards/common/FileAccess.java         |    0 
 wizards/com/sun/star/wizards/common/FileAccess.java |    3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch ---
Index: com/sun/star/wizards/common/FileAccess.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/common/FileAccess.java,v
retrieving revision 1.7
diff -u -p -r1.7 FileAccess.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/common/FileAccess.java	18 Mar 2005 16:13:40 -0000	1.7
+++ openoffice.org/wizards/com/sun/star/wizards/common/FileAccess.java	3 May 2005 11:36:45 -0000
@@ -174,7 +174,8 @@ public class FileAccess {
 					iPos = CurPath.length() - EndLength;
 					if ((CurPath.indexOf(sType) > 0) || (CurPath.indexOf(EndString) == iPos)) {
 						ResultPath = deleteLastSlashfromUrl(CurPath);
-						break;
+						if (xSimpleFileAccess.exists(ResultPath))
+							break;
 					}
 				}
 			} else

openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch:
 filter/source/xsltfilter/XSLTransformer.java |    2 +-
 source/xsltfilter/XSLTransformer.java        |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch ---
Index: source/xsltfilter/XSLTransformer.java
===================================================================
RCS file: /cvs/framework/filter/source/xsltfilter/XSLTransformer.java,v
retrieving revision 1.10
diff -u -p -r1.10 XSLTransformer.java
--- openoffice.org.orig/filter/source/xsltfilter/XSLTransformer.java	29 Mar 2005 14:53:43 -0000	1.10
+++ openoffice.org/filter/source/xsltfilter/XSLTransformer.java	3 May 2005 11:10:45 -0000
@@ -102,7 +102,7 @@ public class XSLTransformer
 
     private static final int STREAM_BUFFER_SIZE = 4000;
     private static final String STATSPROP = "XSLTransformer.statsfile";
-    private static PrintStream statsp;
+    static PrintStream statsp;
 
     private String stylesheeturl;
 	private String targeturl;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- openoffice.org.spec	3 May 2005 09:58:35 -0000	1.179
+++ openoffice.org.spec	3 May 2005 13:56:58 -0000	1.180
@@ -88,6 +88,8 @@
 Patch33: openoffice.org-1.9.97.ooo48362.checkzipresult.sc.patch
 Patch34: openoffice.org-1.9.97.rh156067.noversionedicons.patch
 Patch35: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch
+Patch36: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch
+Patch37: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
 
 %define instdir %{_libdir}/openoffice.org%{version}
 
@@ -672,6 +674,8 @@
 %patch33 -p1 -b .ooo48362.checkzipresult.sc.patch
 %patch34 -p1 -b .rh156067.noversionedicons.patch
 %patch35 -p1 -b .ooo48600.rtfparseerror.svx.patch
+%patch36 -p1 -b .gcc19870.gcjaccessproblem.filter.patch
+%patch37 -p1 -b .ooo48610.searchalltemplates.wizards.patch
 
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
@@ -933,6 +937,7 @@
 %files langpack-cs_CZ
 %defattr(-,root,root)
 %dir %{instdir}
+%{instdir}/help/cs
 %dir %{instdir}/share
 %{instdir}/program/resource/*680cs.res
 %dir %{instdir}/share/dict
@@ -1033,6 +1038,7 @@
 %files langpack-et_EE
 %defattr(-,root,root)
 %dir %{instdir}
+%{instdir}/help/et
 %dir %{instdir}/share
 %{instdir}/program/resource/*680et.res
 %{instdir}/share/readme/LICENSE_et*
@@ -1901,6 +1907,7 @@
 %{instdir}/program/simplereg.uno.so
 %{instdir}/program/slideshow.uno.so
 %{instdir}/program/sbase
+%{instdir}/program/setofficelang*
 %{instdir}/program/soffice
 %{instdir}/program/soffice.bin
 %{instdir}/program/sofficerc
@@ -2430,6 +2437,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue May 03 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.99-2
+- add openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch for gcj bug workaround
+- add openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
+- help documentation for cs and et has landed
+
 * Tue May 03 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.99-1
 - add openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch
 - drop openoffice.org-1.9.95.gcc21233.noquotesonjavaver.patch as of