- partial up to 1.9.90

Changed files:
    libreoffice.spec -> 1.508
    openoffice.org-pld.patch -> 1.3

diff --git a/libreoffice.spec b/libreoffice.spec
index 60b0de5bfe7496e1ffa1a8b2db2282843873cc28..6a5fa914219b286b77b62f41cf12aad10d3f1c6e 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -17,9 +17,9 @@
 
 %define                ver             2.0
 %define                rel             0
-%define                ooobver         1.9.79.2.2
+%define                ooobver         1.9.90
 %define                snap            SRC680
-%define                bver            m79
+%define                bver            m90
 %define                subver          645
 
 %define                fullver         %{ver}.%{rel}
@@ -36,15 +36,15 @@ Epoch:              1
 License:       GPL/LGPL
 Group:         X11/Applications
 Source0:       http://go-ooo.org/packages/%{snap}/ooo-build-%{ooobver}.tar.gz
-# Source0-md5: e5fd24d970b0c459c45787df373e073d
+# Source0-md5: 07526c23db6495b4841c7a71e46d9cbc
 Source1:       http://go-ooo.org/packages/%{snap}/%{ssnap}-%{bver}-core.tar.bz2
-# Source1-md5: c6aca9d683a4a1e86e6f757ba66e1e80
+# Source1-md5: 8222cf9bcacac3892e75a598f2acc343
 Source2:       http://go-ooo.org/packages/%{snap}/ooo_custom_images-13.tar.bz2
 # Source2-md5: 2480af7f890c8175c7f9e183a1b39ed2
 Source3:       http://go-ooo.org/packages/%{snap}/ooo_crystal_images-5.tar.bz2
 # Source3-md5: 040be799b20ccec2791e04a152d97cc3
-Source4:       http://go-ooo.org/packages/%{snap}/extras-1.tar.bz2
-# Source4-md5: c76b1c554529a37975d0149ca8647e7a
+Source4:       http://go-ooo.org/packages/%{snap}/extras-2.tar.bz2
+# Source4-md5: 733051ebeffae5232a2eb760162da020
 Source5:       http://go-ooo.org/packages/libwpd/libwpd-0.8.0.tar.gz
 # Source5-md5: 98e59beecc112339bb78654863304c1c
 Source10:      oocalc.desktop
@@ -1916,7 +1916,6 @@ CONFOPTS=" \
        --with-distro="${DISTRO}" \
        --enable-gtk \
        --enable-kde \
-       --with-images='industrial crystal' \
        --without-binsuffix \
        --with-installed-ooo-dirname=%{name} \
 %if %{with java}

diff --git a/openoffice.org-pld.patch b/openoffice.org-pld.patch
index c928f3a954426a929724684993c380578e710dee..f1e5fe0b8207f123623dd25b533c41faf17e12e0 100644 (file)
--- a/openoffice.org-pld.patch
+++ b/openoffice.org-pld.patch
@@ -1,29 +1,14 @@
-diff -urN ooo-build-1.9.79.2.2.org/patches/src680/buildfix-lotus.diff ooo-build-1.9.79.2.2/patches/src680/buildfix-lotus.diff
---- ooo-build-1.9.79.2.2.org/patches/src680/buildfix-lotus.diff        1970-01-01 01:00:00.000000000 +0100
-+++ ooo-build-1.9.79.2.2/patches/src680/buildfix-lotus.diff    2005-03-21 19:57:47.508300824 +0100
-@@ -0,0 +1,13 @@
-+diff -ur sc/source/filter/lotus/filter.cxx src680-m79/sc/source/filter/lotus/filter.cxx
-+--- sc/source/filter/lotus/filter.cxx 2005-03-21 19:55:29.649258000 +0100
-++++ sc/source/filter/lotus/filter.cxx 2005-03-21 19:55:50.209133008 +0100
-+@@ -71,7 +71,7 @@
-+ 
-+ #include <tools/solar.h>
-+ #include <string.h>
-+-#include <stl/map>
-++#include <map>
-+ 
-+ #include "filter.hxx"
-+ #include "document.hxx"
-+
-diff -urN ooo-build-1.9.79.2.2.org/patches/src680-m79/apply ooo-build-1.9.79.2.2/patches/src680-m79/apply
---- ooo-build-1.9.79.2.2.org/patches/src680-m79/apply  2005-03-17 18:33:16.000000000 +0100
-+++ ooo-build-1.9.79.2.2/patches/src680-m79/apply      2005-03-21 19:58:51.997496976 +0100
-@@ -81,6 +81,8 @@
- # fixes size of some fields in the create table wizard, n#72184; it is already fixed in m84
- # add a missing period i#45103
- wizard-table-filed-sizes.diff
-+# fix for lotus inclugin
-+buildfix-lotus.diff
- 
- [ Fixes ]
- # fix the wizards crasher n#10512
+diff -urN ooo.org/patches/src680/system-mozilla-xmlsecurity.diff ooo/patches/src680/system-mozilla-xmlsecurity.diff
+--- ooo.org/patches/src680/system-mozilla-xmlsecurity.diff     2004-12-14 18:15:32.000000000 +0100
++++ ooo/patches/src680/system-mozilla-xmlsecurity.diff 2005-04-08 20:17:45.352241872 +0200
+@@ -15,8 +15,8 @@
+  MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+ +.ENDIF
+ +
+- NSS_INC = $(MOZ_INC)$/nss
+- NSPR_INC = $(MOZ_INC)$/nspr
++ NSS_INC = /usr/include/nss
++ NSPR_INC = /usr/include/nspr
+  
+ @@ -152,6 +156,93 @@ SLOFILES = \
+       $(SLO)$/seinitializer_nssimpl.obj \