rpms/openoffice.org/devel openoffice.org-1.9.121.rh127576.gnomeprintui.patch, 1.6, 1.7 openoffice.org.spec, 1.427, 1.428

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.121.rh127576.gnomeprintui.patch 
	openoffice.org.spec 
Log Message:
remove warning from gnomeprint

openoffice.org-1.9.121.rh127576.gnomeprintui.patch:
 configuration/ppds/SGENPRT.PS              |    0 
 configuration/psprint.conf                 |    0 
 inc/jobset.hxx                             |    0 
 inc/print.hxx                              |    0 
 psprint/source/printer/cupsmgr.cxx         |    7 
 psprint_conf/configuration/ppds/SGENPRT.PS |    2 
 psprint_conf/configuration/psprint.conf    |    2 
 source/dialogs/makefile.mk                 |    0 
 source/dialogs/printdlg.cxx                |    0 
 source/gdi/jobset.cxx                      |    0 
 source/printer/cupsmgr.cxx                 |    0 
 svtools/source/dialogs/makefile.mk         |    4 
 svtools/source/dialogs/printdlg.cxx        |  524 ++++++++++++++++++++++++++++-
 svtools/util/makefile.mk                   |    8 
 util/makefile.mk                           |    0 
 vcl/inc/jobset.hxx                         |    1 
 vcl/inc/print.hxx                          |    1 
 vcl/source/gdi/jobset.cxx                  |  194 ++++++++++
 18 files changed, 738 insertions(+), 5 deletions(-)

Index: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh127576.gnomeprintui.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-1.9.121.rh127576.gnomeprintui.patch	22 Aug 2005 11:02:01 -0000	1.6
+++ openoffice.org-1.9.121.rh127576.gnomeprintui.patch	30 Aug 2005 11:08:50 -0000	1.7
@@ -886,3 +886,35 @@
  	maBtnHelp.Disable();
  }
 -
+Index: configuration/psprint.conf
+===================================================================
+RCS file: /cvs/external/psprint_config/configuration/psprint.conf,v
+retrieving revision 1.2
+diff -u -p -u -r1.2 psprint.conf
+--- openoffice.org.orig/psprint_conf/configuration/psprint.conf	9 Nov 2004 16:38:35 -0000	1.2
++++ openoffice.org/psprint_conf/configuration/psprint.conf	30 Aug 2005 11:17:50 -0000
+@@ -67,7 +67,7 @@ SubstFont_Cumberland=Courier
+ ; "Printer" and "Command" is required
+ 
+ ; Printer: contains the base name of the PPD and the Printer name separated by /
+-Printer=SGENPRT/Generic Printer
++Printer=SGENPRT/GENERIC
+ 
+ ; DefaultPrinter: marks the default printer
+ DefaultPrinter=1
+Index: configuration/ppds/SGENPRT.PS
+===================================================================
+RCS file: /cvs/external/psprint_config/configuration/ppds/SGENPRT.PS,v
+retrieving revision 1.3
+diff -u -p -u -r1.3 SGENPRT.PS
+--- openoffice.org.orig/psprint_conf/configuration/ppds/SGENPRT.PS	26 Nov 2004 16:10:35 -0000	1.3
++++ openoffice.org/psprint_conf/configuration/ppds/SGENPRT.PS	30 Aug 2005 11:17:51 -0000
+@@ -68,7 +68,7 @@
+ *PSVersion: "(1) 1"
+ *Product: "(Generic Printer)"
+ *ModelName: "Generic Printer"
+-*NickName: "Generic Printer"
++*NickName: "GENERIC"
+ *PCFileName: "SGENPRT.PPD"
+ 
+ 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -r1.427 -r1.428
--- openoffice.org.spec	28 Aug 2005 22:25:04 -0000	1.427
+++ openoffice.org.spec	30 Aug 2005 11:08:50 -0000	1.428
@@ -1,5 +1,5 @@
 %define ooo2ver 126
-%define ooo_rpm_release 1
+%define ooo_rpm_release 2
 %define build_fc4 0
 %define build_fc5 1
 
@@ -818,9 +818,7 @@
 %patch43 -p1 -b .ooo49720.mozillanspr.extensions.patch
 %patch44 -p1 -b .ooo52428.execshield.bridges.patch
 %patch45 -p1 -b .workspace.javapatch.patch
-%if ! %{internaljavabits}
 %patch46 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
-%endif
 %patch47 -p1 -b .ooo52626.workspacerestore.vcl.patch
 %patch48 -p1 -b .ooo53025.exception.package.patch
 %patch49 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
@@ -868,6 +866,8 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
+#thai dictionary has wrong name
+export DIC_ALL=TRUE
 #force linker
 export LINK=$CXX
 #faster build
@@ -1899,6 +1899,9 @@
 %defattr(-,root,root)
 %dir %{instdir}
 %dir %{instdir}/share
+%dir %{instdir}/share/dict
+%dir %{instdir}/share/dict/ooo
+%{instdir}/share/dict/ooo/*th_TH*
 %{instdir}/program/resource/*680th.res
 %{instdir}/share/readme/LICENSE_th*
 %{instdir}/share/readme/README_th*
@@ -3116,6 +3119,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Aug 30 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.126-2
+- ooo#53956# thai dictionary
+- remove unslightly warning from gnomeprint
+
 * Sat Aug 27 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.126-1
 - next version
 - drop integrated workspace.gslpatches4.patch