rpms/openoffice.org/devel openoffice.org.spec, 1.1671, 1.1672 workspace.vcl95.patch, 1.1, 1.2 openoffice.org-3.0.0.ooo94936.vcl.nogtkspinwarn.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31575

Modified Files:
	openoffice.org.spec workspace.vcl95.patch 
Removed Files:
	openoffice.org-3.0.0.ooo94936.vcl.nogtkspinwarn.patch 
Log Message:
now merged into vcl95 upstream


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1671
retrieving revision 1.1672
diff -u -r1.1671 -r1.1672
--- openoffice.org.spec	15 Oct 2008 09:29:59 -0000	1.1671
+++ openoffice.org.spec	15 Oct 2008 13:07:16 -0000	1.1672
@@ -116,8 +116,7 @@
 Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
 Patch46: workspace.vcl94.patch
 Patch47: workspace.vcl95.patch
-Patch48: openoffice.org-3.0.0.ooo94936.vcl.nogtkspinwarn.patch
-Patch49: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
+Patch48: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1319,8 +1318,7 @@
 %patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
 %patch46 -p1 -b .workspace.vcl94.patch
 %patch47 -p1 -b .workspace.vcl95.patch
-%patch48 -p1 -b .ooo94936.vcl.nogtkspinwarn.patch
-%patch49 -p1 -b .ooo94938.unopkg.handleexception.patch
+%patch48 -p1 -b .ooo94938.unopkg.handleexception.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.vcl95.patch:

Index: workspace.vcl95.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl95.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.vcl95.patch	28 Sep 2008 21:40:05 -0000	1.1
+++ workspace.vcl95.patch	15 Oct 2008 13:07:16 -0000	1.2
@@ -43,3 +43,15 @@
          }
      }
  
+diff -ru openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+--- openoffice.org.orig/vcl/unx/gtk.orig/gdi/salnativewidgets-gtk.cxx	2008-10-14 12:47:45.000000000 +0100
++++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	2008-10-14 12:53:43.000000000 +0100
+@@ -3652,7 +3652,7 @@
+ {
+ 	if ( !gWidgetData[nScreen].gSpinButtonWidget )
+ 	{
+-		GtkAdjustment *adj = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 2, 1, 1, 1) );
++		GtkAdjustment *adj = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 1, 1, 1, 0) );
+ 		gWidgetData[nScreen].gSpinButtonWidget = gtk_spin_button_new( adj, 1, 2 );
+ 
+ 		//Setting non-editable means it doesn't blink, so there's no timeouts


--- openoffice.org-3.0.0.ooo94936.vcl.nogtkspinwarn.patch DELETED ---