rpms/openoffice.org/F-10 openoffice.org.spec, 1.1703, 1.1704 openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11091

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch 
Log Message:
merge workspace.vcl98.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1703
retrieving revision 1.1704
diff -u -r1.1703 -r1.1704
--- openoffice.org.spec	12 Dec 2008 11:22:01 -0000	1.1703
+++ openoffice.org.spec	17 Dec 2008 19:13:00 -0000	1.1704
@@ -134,9 +134,9 @@
 Patch61: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
 Patch62: workspace.impress161.patch
 Patch63: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
-Patch64: openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch
-Patch65: workspace.vcl97.patch
-Patch66: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
+Patch64: workspace.vcl97.patch
+Patch65: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
+Patch66: workspace.vcl98.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1395,9 +1395,9 @@
 %patch61 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
 %patch62 -p1 -b .workspace.impress161.patch
 %patch63 -p1
-%patch64 -p1 -b .ooo97064.fpicker.honour-uilang-override.patch
-%patch65 -p1 -b .workspace.vcl97.patch
-%patch66 -p1 -b .ooo97196.vcl.ensuretheme.whenqttesting.patch
+%patch64 -p1 -b .workspace.vcl97.patch
+%patch65 -p1 -b .ooo97196.vcl.ensuretheme.whenqttesting.patch
+%patch66 -p1 -b .workspace.vcl98.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3764,7 +3764,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Fri Dec 12 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
+* Wed Dec 17 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
 - Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything 
   remotely
 - Resolves: rhbz#471485 openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
@@ -3782,6 +3782,7 @@
 - Resolves: rhbz#475795 same fallbacks for printing as screen
   workspace.vcl97.patch
 - Resolves: rhbz#475007 openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
+- add workspace.vcl98.patch
 
 * Fri Nov 07 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.10
 - window manager hatred


--- openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch DELETED ---