- openclipart gallery built externally, no more at install stage; rel 5

Changed files:
    libreoffice.spec -> 1.704.2.21

diff --git a/libreoffice.spec b/libreoffice.spec
index d9adede07030230086fd65d5b85825d2b6367e88..caecfa6016f1dc867119c50ac22d6fe77bd19590 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -14,9 +14,6 @@
 #      - doesn't build with java-sun-1.6 (maybe java-dependent packages are screwed)
 #      - maybe it could be build with gcc-java
 #       - adapt help-support.diff to PLD
-#      - make --without xvfb working, required
-#        REMOVE USE of Xvfb from build-galleries script (ooo-build-2.0.1.2/bin/build-galleries line 84)
-#        then remove that bcond
 #      - configure --without-ppds --without afms
 #      - /share/config/soffice.cfg/global/accelerator/es/ should be in i18n-es
 #      - fix locale names and other locale related things
@@ -42,7 +39,6 @@
 %bcond_with    mono            # enable compilation of mono bindings
 %bcond_without mozilla         # without mozilla components
 %bcond_without i18n            # do not create i18n packages
-%bcond_without xvfb            # using Xvfb in build-galleries script (without xvfb broken)
 
 %bcond_without system_beanshell
 %bcond_without system_db               # without system (i.e. with internal) Berkeley DB
@@ -67,7 +63,7 @@
 %endif
 
 %define                ver             2.1.0
-%define                _rel            4
+%define                _rel            5
 %define                subver          680
 %define                snap            OOE680
 %define                snap2           SRC680
@@ -133,7 +129,6 @@ Patch109:   %{name}-agg25.patch
 URL:           http://www.openoffice.org/
 BuildRequires: /usr/bin/getopt
 BuildRequires: STLport-devel >= 2:5.0.0
-%{?with_xvfb:BuildRequires:    XFree86-Xvfb}
 BuildRequires: XFree86-devel
 %{?with_system_agg:BuildRequires:      agg-devel}
 BuildRequires: autoconf >= 2.51
@@ -176,7 +171,6 @@ BuildRequires:      nas-devel >= 1.7-1
 BuildRequires: neon-devel
 BuildRequires: nspr-devel >= 1:4.6-0.20041030.3
 BuildRequires: nss-devel >= 1:3.10
-BuildRequires: openclipart-png >= 0:0.16
 BuildRequires: openldap-devel
 BuildRequires: pam-devel
 BuildRequires: perl-Archive-Zip
@@ -2181,7 +2175,6 @@ CONFOPTS="\
 %endif
        --with-docdir=%{_docdir}/%{name}-%{version} \
        --with-python=%{__python} \
-       --with-openclipart=%{_datadir}/openclipart \
        --with-stlport=/usr \
        --with-x \
        --without-fonts \