rpms/openoffice.org/devel openoffice.org.spec,1.1185,1.1186

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27757

Modified Files:
	openoffice.org.spec 
Log Message:
disable stlport


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1185
retrieving revision 1.1186
diff -u -r1.1185 -r1.1186
--- openoffice.org.spec	23 May 2007 12:55:44 -0000	1.1185
+++ openoffice.org.spec	23 May 2007 15:37:35 -0000	1.1186
@@ -2,16 +2,23 @@
 %define ooomilestone 17
 %define rh_rpm_release 2
 
-# gcc#19664#
-%define stlvisibilityfcked 1
-# undef to get english only and no-langpacks for a quick smoketest build
+# undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
 # undef to revert to the traditional print dialog
 %define gtkprintui 1
-# undef to revert from combining startup libs into a single libsoffice 
+# undef to refrain from combining startup libs into a single libsoffice 
 %define linkopt 1
+# whether to use stlport or gcc's stl, we're basically locked to stlport
+# for i386 to enable third party built against "vanilla OOo" uno components 
+# and add-ons to work with our OOo. We assume there aren't any such for the
+# other archs
+%ifarch %{ix86}
+%define stlport_abi_lockin 1
+%else
+%define stlport_abi_lockin 0
+%endif
 
-%if %{stlvisibilityfcked}
+%if %{stlport_abi_lockin}
 %define stlflags --with-stlport4
 %else
 %define stlflags --without-stlport4
@@ -2121,7 +2128,7 @@
 %{_datadir}/mime-info/*
 %{instdir}/program/libxmlsecurity.so
 %{instdir}/program/liboldxmlsec*
-%if %{stlvisibilityfcked}
+%if %{stlport_abi_lockin}
 %{instdir}/program/libstlport*.so
 %endif
 %dir %{_datadir}/mimelnk
@@ -2645,6 +2652,7 @@
 * Wed May 23 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-17.2
 - remove LD_LIBRARY_PATH again, the third party extension requiring it 
   links against the wrong libraries
+- try and re-disable stlport for selected platforms
 
 * Tue May 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-17.1
 - next 2.2.1 release candidate