rpms/openoffice.org/devel openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch, NONE, 1.1 .cvsignore, 1.61, 1.62 openoffice.org.spec, 1.299, 1.300 sources, 1.88, 1.89

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jul 13 17:24:39 UTC 2005 

Author: caolanm

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

Modified Files:
	.cvsignore openoffice.org.spec sources 
Added Files:
	openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch 
Log Message:
next version

openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch:
 VCL.xcu |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

--- NEW FILE openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch ---
--- openoffice.org.orig/officecfg/SRC680_m116/officecfg/registry/data/org/openoffice/VCL.xcu	2005-07-13 15:34:20.000000000 +0100
+++ openoffice.org/officecfg/SRC680_m116/officecfg/registry/data/org/openoffice/VCL.xcu	2005-07-13 15:34:31.000000000 +0100
@@ -94,7 +94,7 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace">
         <value>HG Mincho Light J;MS Mincho;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS PMincho;HG Mincho Light J;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Luxi Sans</value>
@@ -127,7 +127,7 @@
         <value>Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;Luxi Sans;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SYMBOL" oor:type="xs:string" oor:op="replace">
         <value>StarSymbol;OpenSymbol;Andale Sans UI;Arial Unicode MS;StarBats;Zapf Dingbats;WingDings;Symbol</value>
@@ -163,13 +163,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -198,13 +198,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -233,13 +233,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -268,13 +268,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -303,13 +303,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -338,13 +338,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -373,13 +373,13 @@
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>Albany;Arial;Luxi Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>Thorndale;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
+        <value>Thorndale AMT;Times New Roman;Nimbus Roman No9 L;Luxi Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value>
       </prop>
       <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace">
         <value>Cumberland;Courier New;Luxi Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value>
@@ -619,13 +619,13 @@
         <value>썬바탕;SunBatang;Baekmuk Dotum;Batang;Myeongjo;썬굴림;SunGulim;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace">
-        <value>썬굴림;SunGulim;Baekmuk Dotum;Batang;Myeongjo;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>썬굴림;SunGulim;Baekmuk Dotum;Batang;Myeongjo;Gulim;Roundgothic;Thorndale AMT;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace">
         <value>썬돋움;SunDotum;Baekmuk Dotum;Batang;Myeongjo;썬굴림;SunGulim;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace">
-        <value>썬바탕;SunBatang;Baekmuk Dotum;Batang;Myeongjo;썬굴림;SunGulim;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>썬바탕;SunBatang;Baekmuk Dotum;Batang;Myeongjo;썬굴림;SunGulim;Gulim;Roundgothic;Thorndale AMT;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="SANS" oor:type="xs:string" oor:op="replace">
         <value>썬돋움;SunDotum;Baekmuk Dotum;Batang;Myeongjo;썬굴림;SunGulim;Gulim;Roundgothic;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
@@ -634,7 +634,7 @@
         <value>썬굴림;SunGulim;Baekmuk Dotum;Gulim;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif</value>
       </prop>
       <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace">
-        <value>썬굴림;SunGulim;Baekmuk Dotum;Batang;Myeongjo;Gulim;Roundgothic;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
+        <value>썬굴림;SunGulim;Baekmuk Dotum;Batang;Myeongjo;Gulim;Roundgothic;Thorndale AMT;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>
       </prop>
       <prop oor:name="CJK_DISPLAY" oor:type="xs:string" oor:op="replace">
         <value>썬굴림;SunGulim;Baekmuk Dotum;Gulim;Roundgothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	9 Jul 2005 13:25:47 -0000	1.61
+++ .cvsignore	13 Jul 2005 17:24:37 -0000	1.62
@@ -119,3 +119,4 @@
 SRC680_m114.tar.bz2
 SRC680_m115.tar.bz2
 SRC680_m116.tar.bz2
+SRC680_m117.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- openoffice.org.spec	13 Jul 2005 12:47:38 -0000	1.299
+++ openoffice.org.spec	13 Jul 2005 17:24:37 -0000	1.300
@@ -1,5 +1,5 @@
-%define ooo2ver 116
-%define ooo_rpm_release 3.cmc
+%define ooo2ver 117
+%define ooo_rpm_release 1
 %define build_fc4 0
 %define build_fc5 1
 
@@ -96,40 +96,40 @@
 Patch27: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
 Patch28: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
 Patch29: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
-Patch30: workspace.fpicker4.patch
-Patch31: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
-Patch32: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
-Patch33: workspace.vcl39.patch
-Patch34: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
-Patch35: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
-Patch36: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
-Patch37: workspace.gslpatches2.patch
-Patch38: workspace.fpicandrpath.patch
-Patch39: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
-Patch40: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
-Patch41: openoffice.org-1.9.110.oooXXXXX.psprintfriend.patch
-Patch42: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
-Patch43: openoffice.org-1.9.112.ooo51724.testtools.patch
-Patch44: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
-Patch45: openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch
-Patch46: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
-Patch47: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch48: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
-Patch49: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
-Patch50: openoffice.org-1.9.114.ooo51638.mailmerge.patch
-#Patch51: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
-Patch52: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
-Patch53: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
-Patch54: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
-Patch55: openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch
-Patch56: openoffice.org-1.9.115.ooo51745.cpputools.patch
-Patch57: openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
-Patch58: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
-Patch59: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
-Patch60: openoffice.org-1.9.116.rhXXXXX.desktop.noexpand.patch
-Patch61: workspace.impress63.patch
-Patch62: openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch
-Patch63: openoffice.org-1.9.114.oooXXXXX.systemboost.patch
+Patch30: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
+Patch31: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
+Patch32: workspace.vcl39.patch
+Patch33: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
+Patch34: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
+Patch35: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
+Patch36: workspace.gslpatches2.patch
+Patch37: workspace.fpicandrpath.patch
+Patch38: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
+Patch39: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
+Patch40: openoffice.org-1.9.110.oooXXXXX.psprintfriend.patch
+Patch41: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
+Patch42: openoffice.org-1.9.112.ooo51724.testtools.patch
+Patch43: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
+Patch44: openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch
+Patch45: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
+Patch46: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch47: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+Patch48: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
+Patch49: openoffice.org-1.9.114.ooo51638.mailmerge.patch
+#Patch50: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
+Patch51: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
+Patch52: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
+Patch53: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
+Patch54: openoffice.org-1.9.115.oooXXXXX.systemxmlsec.patch
+Patch55: openoffice.org-1.9.115.ooo51745.cpputools.patch
+Patch56: openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
+Patch57: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
+Patch58: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
+Patch59: openoffice.org-1.9.116.rhXXXXX.desktop.noexpand.patch
+Patch60: workspace.impress63.patch
+Patch61: openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch
+Patch62: openoffice.org-1.9.114.oooXXXXX.systemboost.patch
+Patch63: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -739,40 +739,40 @@
 %patch27 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch
 %patch28 -p1 -b .use-fontconfig-everwhere.patch
 %patch29 -p1 -b .berkeleydb-jni-casting-misuse.patch
-%patch30 -p1 -b .workspace.fpicker4.patch
-%patch31 -p1 -b .ooo44627.sal.brokencondition.patch
-%patch32 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
-%patch33 -p1 -b .workspace.vcl39.patch
-%patch34 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
-%patch35 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
-%patch36 -p1 -b .ooo47323.binfilter.stupiddetect.patch
-%patch37 -p1 -b .workspace.gslpatches2.patch
-%patch38 -p1 -b .workspace.fpicandrpath.patch
-%patch39 -p1 -b .NONE.gcc3gcj4.patch
-%patch40 -p1 -b .ooo9290.goodies.epstoepdf.patch
-%patch41 -p1 -b .oooXXXXX.psprintfriend.patch
-%patch42 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
-%patch43 -p1 -b .ooo51724.testtools.patch
-%patch44 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
-%patch45 -p1 -b .ooo43430.cvskk.np_sdk.patch
-%patch46 -p1 -b .ooo51385.bridges.stack.patch
-%patch47 -p1 -b .ooo51718.rpath.patch
-%patch48 -p1 -b .rh161886.rpath.desktop.patch
-%patch49 -p1 -b .ooo51637.solenv.pyuno.patch
-%patch50 -p1 -b .ooo51638.mailmerge.patch
-#%patch51 -p1 -b .oooXXXXX.nostlport.patch
-%patch52 -p1 -b .ooo51673.printing.checkerror.patch
-%patch53 -p1 -b .ooo51735.audio.withoutnas.patch
-%patch54 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
-%patch55 -p1 -b .oooXXXXX.systemxmlsec.patch
-%patch56 -p1 -b .ooo51745.cpputools.patch
-%patch57 -p1 -b .ooo51755.scp2.parallel.patch
-%patch58 -p1 -b .ooo51774.rsc.parallel.patch
-%patch59 -p1 -b .oooXXXXX.extensions.evolution.patch
-%patch60 -p1 -b .rhXXXXX.desktop.noexpand.patch
-%patch61 -p1 -b .workspace.impress63.patch
-%patch62 -p1 -b .rh162935.gccXXXXX.weirdcrash.patch
-%patch63 -p1 -b .oooXXXXX.systemboost.patch
+%patch30 -p1 -b .ooo44627.sal.brokencondition.patch
+%patch31 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
+%patch32 -p1 -b .workspace.vcl39.patch
+%patch33 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
+%patch34 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
+%patch35 -p1 -b .ooo47323.binfilter.stupiddetect.patch
+%patch36 -p1 -b .workspace.gslpatches2.patch
+%patch37 -p1 -b .workspace.fpicandrpath.patch
+%patch38 -p1 -b .NONE.gcc3gcj4.patch
+%patch39 -p1 -b .ooo9290.goodies.epstoepdf.patch
+%patch40 -p1 -b .oooXXXXX.psprintfriend.patch
+%patch41 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
+%patch42 -p1 -b .ooo51724.testtools.patch
+%patch43 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
+%patch44 -p1 -b .ooo43430.cvskk.np_sdk.patch
+%patch45 -p1 -b .ooo51385.bridges.stack.patch
+%patch46 -p1 -b .ooo51718.rpath.patch
+%patch47 -p1 -b .rh161886.rpath.desktop.patch
+%patch48 -p1 -b .ooo51637.solenv.pyuno.patch
+%patch49 -p1 -b .ooo51638.mailmerge.patch
+#%patch50 -p1 -b .oooXXXXX.nostlport.patch
+%patch51 -p1 -b .ooo51673.printing.checkerror.patch
+%patch52 -p1 -b .ooo51735.audio.withoutnas.patch
+%patch53 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
+%patch54 -p1 -b .oooXXXXX.systemxmlsec.patch
+%patch55 -p1 -b .ooo51745.cpputools.patch
+%patch56 -p1 -b .ooo51755.scp2.parallel.patch
+%patch57 -p1 -b .ooo51774.rsc.parallel.patch
+%patch58 -p1 -b .oooXXXXX.extensions.evolution.patch
+%patch59 -p1 -b .rhXXXXX.desktop.noexpand.patch
+%patch60 -p1 -b .workspace.impress63.patch
+%patch61 -p1 -b .rh162935.gccXXXXX.weirdcrash.patch
+%patch62 -p1 -b .oooXXXXX.systemboost.patch
+%patch63 -p1 -b .rh163147.thorndale.fontconfig.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/db4 then this needs to be modified/dropped
@@ -2956,10 +2956,12 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Wed Jul 13 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.116-4
-- lets continue to use stlport for fc4, because I have suspicions I don't
-  want to inflict on the stable branch
+* Wed Jul 13 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.117-1
+- bump to next version and drop the integrated (finally) fpicker patch
+- back to using stlport for now because I'm dubious
 - rh#162984# fallbacks from en_AU to en_GB for wizards
+- rh#160783# set a targetname for font when it's found
+- add openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
 
 * Mon Jul 11 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.116-3
 - enable evo addressbook in addressbook wizard


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- sources	13 Jul 2005 12:49:48 -0000	1.88
+++ sources	13 Jul 2005 17:24:37 -0000	1.89
@@ -2,4 +2,4 @@
 176aa81d51a6ed28c5e9a14696a8d208  openoffice.org-jakubicons.tar.gz
 6b3bd4b8eb31dd067d4cb2dcc1ba5e12  openoffice.org-myspell-contrib.tar.gz
 11c0541fa373a327d1c134887ce511e7  openoffice.org-simple-crash_report.sh
-77dca5adbc74b1ef026128ab0d0101b6  SRC680_m116.tar.bz2
+0eb3ae8fa889915f1c302e685de43f98  SRC680_m117.tar.bz2

More information about the fedora-cvs-commits mailing list