[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org.spec,1.276,1.277



Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
try nostlport again


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- openoffice.org.spec	7 Jul 2005 07:13:32 -0000	1.276
+++ openoffice.org.spec	7 Jul 2005 07:30:31 -0000	1.277
@@ -113,7 +113,7 @@
 Patch50: openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch
 Patch51: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
 Patch52: openoffice.org-1.9.114.ooo51638.mailmerge.patch
-#Patch53: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
+Patch53: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -745,7 +745,7 @@
 %patch50 -p1 -b .ooo50745.cruxcrash.vcl.patch
 %patch51 -p1 -b .ooo51637.solenv.pyuno.patch
 %patch52 -p1 -b .ooo51638.mailmerge.patch
-#%patch53 -p1 -b .oooXXXXX.nostlport.patch
+%patch53 -p1 -b .oooXXXXX.nostlport.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/portaudio/sndfile/db4 then this needs to be modified/dropped
@@ -778,8 +778,7 @@
 fi
 cd config_office
 autoconf
-#%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --disable-fontooo --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-nas --without-system-sndfile --without-system-portaudio --without-system-db --without-fonts --without-stlport4 %{withlang}
-%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --disable-fontooo --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-nas --without-system-sndfile --without-system-portaudio --without-system-db --without-fonts %{withlang}
+%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --disable-fontooo --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-nas --without-system-sndfile --without-system-portaudio --without-system-db --without-fonts --without-stlport4 %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -2119,7 +2118,6 @@
 %{instdir}/program/libspl680*.so
 %{instdir}/program/libsrtrs1.so
 %{instdir}/program/libstore.so
-%{instdir}/program/libstlport_gcc.so
 %{instdir}/program/libstore.so.3
 %{instdir}/program/libsts680*.so
 %{instdir}/program/libsvl680*.so
@@ -2938,6 +2936,8 @@
   multiple pyuno registering failures
 - add openoffice.org-1.9.114.ooo51638.mailmerge.patch to provide email
   support for maill merge
+- add openoffice.org-1.9.114.oooXXXXX.nostlport.patch and not build
+  stlport
 
 * Mon Jul 04 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.114-1
 - bump to next version


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]