rpms/openoffice.org/devel openoffice.org-2.0.2.rh188467.printingdefaults.patch, NONE, 1.1 openoffice.org-1.9.121.rh127576.gnomeprintui.patch, 1.14, 1.15 openoffice.org.spec, 1.660, 1.661

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Apr 12 09:54:23 UTC 2006 

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.121.rh127576.gnomeprintui.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2.rh188467.printingdefaults.patch 
Log Message:
separate printing defaults

openoffice.org-2.0.2.rh188467.printingdefaults.patch:
 configuration/ppds/SGENPRT.PS                |    0 
 configuration/psprint.conf                   |    0 
 psprint_config/configuration/ppds/SGENPRT.PS |    1 +
 psprint_config/configuration/psprint.conf    |    4 ++--
 4 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.0.2.rh188467.printingdefaults.patch ---
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_config/configuration/ppds/SGENPRT.PS	26 Nov 2004 16:10:35 -0000	1.3
+++ openoffice.org/psprint_config/configuration/ppds/SGENPRT.PS	30 Aug 2005 11:17:51 -0000
@@ -58,6 +58,7 @@
 *ColorDevice: True
 *DefaultColorSpace: RGB
 *LanguageLevel: "2"
+*TTRasterizer: Type42
 
 *% --- For None Color or old PostScript(R) printers use following lines ---
 *% *ColorDevice: False
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_config/configuration/psprint.conf	9 Nov 2004 16:38:35 -0000	1.2
+++ openoffice.org/psprint_config/configuration/psprint.conf	30 Aug 2005 11:17:50 -0000
@@ -48,7 +48,7 @@
 ;         defaults for newly added printers.
 ; PerformFontSubstitution: wether to replace downloadable fonts
 ;         with resident fonts or not
-PerformFontSubstitution=true
+PerformFontSubstitution=false
 
 ; SubstFont_<downloadable font>: the resident font to replace
 ;         <downloadable font> if PerformFontSubstitution is true
@@ -84,7 +84,7 @@
 
 ; PerformFontSubstitution: wether to replace downloadable fonts
 ;         with resident fonts or not
-PerformFontSubstitution=true
+PerformFontSubstitution=false
 
 ; SubstFont_<downloadable font>: the resident font to replace
 ;         <downloadable font> if PerformFontSubstitution is true

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           |   19 
 psprint/source/printer/makefile.mk           |    2 
 psprint/util/makefile.mk                     |    4 
 psprint_config/configuration/ppds/SGENPRT.PS |    2 
 psprint_config/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          |  525 ++++++++++++++++++++++++++-
 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 +++++++++
 20 files changed, 757 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openoffice.org-1.9.121.rh127576.gnomeprintui.patch	11 Apr 2006 16:50:29 -0000	1.14
+++ openoffice.org-1.9.121.rh127576.gnomeprintui.patch	12 Apr 2006 09:54:19 -0000	1.15
@@ -945,14 +945,6 @@
  *PCFileName: "SGENPRT.PPD"
  
  
-@@ -58,6 +58,7 @@
- *ColorDevice: True
- *DefaultColorSpace: RGB
- *LanguageLevel: "2"
-+*TTRasterizer: Type42
- 
- *% --- For None Color or old PostScript(R) printers use following lines ---
- *% *ColorDevice: False
 --- openoffice.org.orig/psprint/util/makefile.mk	2006-04-10 16:10:36.000000000 +0100
 +++ openoffice.org/psprint/util/makefile.mk	2006-04-11 17:31:45.000000000 +0100
 @@ -89,5 +89,9 @@


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.660
retrieving revision 1.661
diff -u -r1.660 -r1.661
--- openoffice.org.spec	11 Apr 2006 16:51:59 -0000	1.660
+++ openoffice.org.spec	12 Apr 2006 09:54:19 -0000	1.661
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 8.cmc2
+%define rh_rpm_release 9
 
 %define build_fc6 1
 %define build_rhel4 0
@@ -213,6 +213,7 @@
 Patch37: openoffice.org-1.9.74.ArchiveZip.patch
 Patch38: openoffice.org-2.0.1.gij4ant.patch
 %endif
+Patch39: openoffice.org-2.0.2.rh188467.printingdefaults.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1077,7 +1078,6 @@
 %patch34 -p1 -b .ooo62030.solenv._version.patch
 %patch35 -p1 -b .oooXXXXX.config_office.noppds.patch
 %patch36 -p1 -b .ooo63155.sfx2.badscript.patch
-
 %if %{build_rhel4}
 %patch37 -p1 -b .rhXXXXXX.config_office.archivezip.patch
 tar xjf %{SOURCE12}
@@ -1086,6 +1086,7 @@
 tar xzf %{SOURCE13} Archive-Zip-1.13/lib
 cd ../..
 %endif
+%patch39 -p1 -b .rh188467.printingdefaults.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3570,8 +3571,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Tue Apr 11 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
+* Wed Apr 12 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
 - rh#187939# not detecting changes to CUPS printers during execution
+- rh#188467# set printer font-handling defaults
 
 * Mon Apr 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
 - rh#188053# more a11y fixes

More information about the fedora-cvs-commits mailing list