rpms/openoffice.org/devel openoffice.org.spec,1.746,1.747

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jun 28 17:51:51 UTC 2006


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
still wrong


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.746
retrieving revision 1.747
diff -u -r1.746 -r1.747
--- openoffice.org.spec	28 Jun 2006 09:30:14 -0000	1.746
+++ openoffice.org.spec	28 Jun 2006 17:51:48 -0000	1.747
@@ -1,6 +1,6 @@
 %define oootag OOC680
 %define ooomilestone 7
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -103,9 +103,8 @@
 Patch37: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
 Patch38: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
 Patch39: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
-Patch40: openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch
-Patch41: openoffice.org-2.0.3.ooo65519.printing.samba.patch
-Patch42: workspace.sixtyfour06.patch
+Patch40: openoffice.org-2.0.3.ooo65519.printing.samba.patch
+Patch41: workspace.sixtyfour06.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -836,9 +835,8 @@
 %patch37 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
 %patch38 -p1 -b .rh192588.officecfg.defaultcairooff.patch
 %patch39 -p1 -b .ooo66067.embeddedobj.crash.patch
-%patch40 -p1 -b .ooo66018.idlc.dangerousvisibility.patch
-%patch41 -p1 -b .ooo65519.printing.samba.patch
-%patch42 -p1 -b .workspace.sixtyfour06.patch
+%patch40 -p1 -b .ooo65519.printing.samba.patch
+%patch41 -p1 -b .workspace.sixtyfour06.patch
 
 tar xzf %{SOURCE1}
 
@@ -860,6 +858,8 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
+# visibility b0rked ? ooo#66018#
+unset HAVE_GCC_VISIBILITY_FEATURE
 #configure buglet
 export WITHOUT_PPDS="YES"
 export WITHOUT_AFMS="YES"
@@ -3314,9 +3314,8 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Wed Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.2
-- add openoffice.org.2.0.3-ooo66018.idlc.dangerousvisibility.patch to test my
-  visibility suspicions
+* Wed Jun 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.3
+- unset HAVE_GCC_VISIBILITY_FEATURE inline symbols visibility problems
 
 * Tue Jun 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.1
 - next milestone




More information about the fedora-cvs-commits mailing list