rpms/openoffice.org/devel openoffice.org-1.9.114.oooXXXXX.nostlport.patch, 1.2, 1.3 openoffice.org.spec, 1.274, 1.275

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.114.oooXXXXX.nostlport.patch 
	openoffice.org.spec 
Log Message:
dammit

openoffice.org-1.9.114.oooXXXXX.nostlport.patch:
 dbaccess/source/core/api/RowSet.cxx                    |   17 ++-
 dbaccess/source/core/api/RowSet.hxx                    |    2 
 dbaccess/source/core/api/RowSetBase.cxx                |   24 ++---
 dbaccess/source/core/api/RowSetCache.cxx               |   14 +-
 dbaccess/source/core/api/RowSetCacheIterator.cxx       |   17 +--
 dbaccess/source/core/api/RowSetCacheIterator.hxx       |    2 
 dbaccess/source/core/dataaccess/datasource.cxx         |    2 
 dbaccess/source/filter/xml/xmlDataSource.cxx           |    2 
 dbaccess/source/filter/xml/xmlTableFilterList.cxx      |    4 
 dbaccess/source/ui/dlg/DbAdminImpl.cxx                 |    2 
 dbaccess/source/ui/dlg/indexdialog.cxx                 |   42 ++++----
 dbaccess/source/ui/inc/indexcollection.hxx             |   26 ++---
 dbaccess/source/ui/misc/indexcollection.cxx            |   40 ++++----
 forms/source/xforms/propertysetbase.cxx                |    2 
 forms/source/xforms/submission.cxx                     |    2 
 openoffice.org/stlport/systemstl/numeric               |   80 +++++++++++++++++
 scp2/source/ure/makefile.mk                            |    4 
 source/accessibility/AccessibleEmptyEditSource.cxx     |    0 
 source/core/api/RowSet.cxx                             |    0 
 source/core/api/RowSet.hxx                             |    0 
 source/core/api/RowSetBase.cxx                         |    0 
 source/core/api/RowSetCache.cxx                        |    0 
 source/core/api/RowSetCacheIterator.cxx                |    0 
 source/core/api/RowSetCacheIterator.hxx                |    0 
 source/core/dataaccess/datasource.cxx                  |    0 
 source/filter/xml/xmlDataSource.cxx                    |    0 
 source/filter/xml/xmlTableFilterList.cxx               |    0 
 source/ui/dlg/DbAdminImpl.cxx                          |    0 
 source/ui/dlg/indexdialog.cxx                          |    0 
 source/ui/inc/indexcollection.hxx                      |    0 
 source/ui/misc/indexcollection.cxx                     |    0 
 source/ure/makefile.mk                                 |    0 
 source/xforms/propertysetbase.cxx                      |    0 
 source/xforms/submission.cxx                           |    0 
 stlport/makefile.mk                                    |    1 
 stlport/systemstl/functional                           |    4 
 stlport/systemstl/rope                                 |    2 
 stlport/systemstl/vector                               |   16 ---
 svx/source/accessibility/AccessibleEmptyEditSource.cxx |    4 
 systemstl/functional                                   |    0 
 systemstl/rope                                         |    0 
 systemstl/vector                                       |    0 
 42 files changed, 198 insertions(+), 111 deletions(-)

Index: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.114.oooXXXXX.nostlport.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.114.oooXXXXX.nostlport.patch	6 Jul 2005 17:42:21 -0000	1.2
+++ openoffice.org-1.9.114.oooXXXXX.nostlport.patch	6 Jul 2005 22:01:45 -0000	1.3
@@ -869,7 +869,7 @@
  {
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ openoffice.org/stlport/systemstl/numeric	2005-07-06 10:15:34.000000000 +0000
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,80 @@
 +/*************************************************************************
 + *
 + *  $RCSfile$
@@ -935,6 +935,7 @@
 +#define SYSTEM_STL_NUMERIC
 +
 +#ifdef GCC
++#include <functional>
 +#include <ext/../numeric>
 +#include <ext/numeric>
 +


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- openoffice.org.spec	6 Jul 2005 19:03:40 -0000	1.274
+++ openoffice.org.spec	6 Jul 2005 22:01:45 -0000	1.275
@@ -778,7 +778,8 @@
 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 --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}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh