- ooo-build update

Changed files:
    libreoffice.spec -> 1.409

diff --git a/libreoffice.spec b/libreoffice.spec
index 6480c7aba335039c411110feb2b8115f41700322..e6e94b3ee303e93ba227336a236998f1034c08e8 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -14,7 +14,7 @@
 
 %define                ver             1.1
 %define                rel             2
-%define                ooobver         1.1.61
+%define                ooobver         1.3.0
 %define                subver          645
 %define                fullver         %{ver}.%{rel}
 %define                dfullver        %(echo %{fullver} | tr . _)
@@ -28,14 +28,15 @@ Release:    0.1
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
-Source0:       http://ooo.ximian.com/packages/OOO_%{dfullver}/ooo-build-%{ooobver}.tar.gz
-# Source0-md5: 6ab5f5c7adcc250c2cb2a5ec16d0dd06
+#Source0:      http://ooo.ximian.com/packages/OOO_%{dfullver}/ooo-build-%{ooobver}.tar.gz
+Source0:       http://ooo.ximian.com/packages/snap/ooo-build-%{ooobver}-HEAD-20040716.tar.gz
+# Source0-md5: 54e7a91fe1a4d07711fa5521e5f127d1
 Source1:       http://ooo.ximian.com/packages/OOO_%{dfullver}/OOO_%{dfullver}.tar.bz2
 # Source1-md5: 627fbce603598a74f9be03f5a1da6d94
 Source2:       http://ooo.ximian.com/packages/ooo-icons-OOO_1_1-9.tar.gz
 # Source2-md5: 32a0e62f89ef36a91437fc705fbe6440
-Source3:       http://kde.openoffice.org/files/documents/159/1785/ooo-KDE_icons-OOO_1_1-0.1.tar.gz
-# Source3-md5: 5157d4453d17cae586ce24989d34357a
+Source3:       http://kde.openoffice.org/files/nidaba/documents/159/1929/ooo-KDE_icons-OOO_1_1-0.2.tar.gz
+# Source3-md5: 50486f5208ec5ae7af1dbb8f9e77cb12
 Source10:      http://ep09.pld-linux.org/~adgor/pld/%{name}-desktopfiles-0.2.tar.bz2
 # Source10-md5:        78ae3bef3e98f711b1afe9fb5717b42e
 
@@ -71,10 +72,6 @@ Source410:   %{cftp}/helpcontent/helpcontent_88_unix.tgz
 # Source410-md5:       3b00571318e45965dee0545d86306d65
 
 Patch0:                %{name}-rh-disable-spellcheck-all-langs.patch
-Patch1:                %{name}-pld-config.patch
-Patch2:                %{name}-apply.patch
-Patch3:                %{name}-bashizm.patch
-Patch4:                %{name}-setup.patch
 
 URL:           http://www.openoffice.org/
 BuildRequires: ImageMagick
@@ -875,10 +872,6 @@ chi
 %prep
 %setup -q -n ooo-build-%{ooobver}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 install -d src
 ln -s %{SOURCE1} src/
@@ -918,6 +911,7 @@ RPM_BUILD_NR_THREADS="%(echo "%{__make}" | sed -e 's#.*-j\([[:space:]]*[0-9]\+\)
 CONFOPTS=" \
        --with-tag=OOO_%{dfullver} \
        --with-ccache-allowed \
+       --with-system-libs \
        --with-system-gcc \
        --with-system-zlib \
        --with-system-sane-headers \
@@ -927,6 +921,7 @@ CONFOPTS=" \
        --with-system-curl \
        --with-system-freetype \
        --with-system-nas \
+       --with-system-xrender \
        --with-vendor="PLD" \
        --with-distro="PLD" \
 %if %{with icons_ximian}
@@ -934,7 +929,8 @@ CONFOPTS=" \
 %else
        --with-icons="KDE" \
 %endif
-       --with-widgetsets=original,kde,gtk \
+       --enable-gtk \
+       --enable-kde \
        --with-installed-ooo-dirname=%{name} \
 %if %{with java}
        --enable-java \