rpms/openoffice.org/FC-4 openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.2, 1.3 openoffice.org.spec, 1.220, 1.221

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.129.ooo54603.fontconfig.patch 
	openoffice.org.spec 
Log Message:
slightly different fontconfig on fc4

openoffice.org-1.9.129.ooo54603.fontconfig.patch:
 fontmanager/fontcache.cxx                 |    2 
 fontmanager/fontmanager.cxx               |    9 
 inc/psprint/fontmanager.hxx               |    0 
 psprint/fontmanager.hxx                   |   13 -
 psprint/source/fontmanager/fontconfig.cxx |  269 ++++++++++++++++++-----
 source/fontmanager/fontcache.cxx          |    0 
 source/fontmanager/fontconfig.cxx         |    0 
 source/fontmanager/fontmanager.cxx        |    0 
 vcl/inc/outdev.h                          |    3 
 vcl/inc/outfont.hxx                       |   15 +
 vcl/source/gdi/outdev3.cxx                |  338 +++++++++++++++++++++---------
 vcl/source/window/window.cxx              |    5 
 vcl/util/makefile.mk                      |    2 
 13 files changed, 487 insertions(+), 169 deletions(-)

Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.129.ooo54603.fontconfig.patch	20 Nov 2005 14:51:54 -0000	1.2
+++ openoffice.org-1.9.129.ooo54603.fontconfig.patch	23 Nov 2005 09:35:01 -0000	1.3
@@ -997,7 +997,7 @@
 +    {
 +	    OString maTargetName = OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8);
 +        rWrapper.FcPatternAddString(pPattern, FC_FAMILY, (FcChar8*)maTargetName.getStr());
-+        break;
++        //break;
 +    }
 +
 +    if( rLangAttrib.Len() )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- openoffice.org.spec	21 Nov 2005 16:37:10 -0000	1.220
+++ openoffice.org.spec	23 Nov 2005 09:35:02 -0000	1.221
@@ -1,6 +1,6 @@
 %define oootag SRC680
 %define ooomilestone 141
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 %define build_fc5 0
 %define build_fc4 1
@@ -3299,6 +3299,7 @@
 %changelog
 * Thu Nov 17 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.141.2
 - rh#173775# crash on help under some circumstances
+- fc4 fontconfig slightly different
 
 * Thu Nov 17 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.141.1
 - next version