rpms/openoffice.org/devel openoffice.org.spec,1.1166,1.1167

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
sigh


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1166
retrieving revision 1.1167
diff -u -r1.1166 -r1.1167
--- openoffice.org.spec	17 Apr 2007 13:47:11 -0000	1.1166
+++ openoffice.org.spec	18 Apr 2007 09:50:31 -0000	1.1167
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 5.1test
+%define rh_rpm_release 6
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -9,7 +9,7 @@
 # undef to revert to the traditional print dialog
 %define gtkprintui 1
 # undef to revert from combining startup libs into a single libsoffice 
-%define linkopt 1
+%define linkopt 0
 
 %if %{stlvisibilityfcked}
 %define stlflags --with-stlport4
@@ -2633,6 +2633,7 @@
 - merge openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
 - Resolves: rhbz#235834 update font subpixel logic
 - add dynamicsection patch for better offline debugging
+- Resolves: rhbz#236671 backup ldmerge
 
 * Wed Apr 11 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.5
 - Resolves: rhbz#235828 INIFILE optimization breaks addins