Author: glen Date: Thu Mar 8 16:21:46 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- openclipart gallery built externally, no more at install stage; rel 5
---- Files affected:
SPECS:
openoffice.org.spec (1.721 -> 1.722)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.721 SPECS/openoffice.org.spec:1.722
--- SPECS/openoffice.org.spec:1.721 Thu Mar 8 03:58:37 2007
+++ SPECS/openoffice.org.spec Thu Mar 8 17:21:40 2007
@@ -19,9 +19,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
@@ -47,7 +44,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
@@ -72,7 +68,7 @@
%endif
%define ver 2.1.0
-%define _rel 0.22
+%define _rel 5
%define subver 680
%define snap OOE680
%define snap2 SRC680
@@ -179,7 +175,6 @@
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
@@ -204,12 +199,6 @@
BuildRequires: xmlsec1-nss-devel
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXaw-devel
-%if %{with xvfb}
-#BuildRequires: xorg-app-mkfontdir (missing PreReq in fonts?)
-BuildRequires: xorg-font-font-cursor-misc
-BuildRequires: xorg-font-font-misc-misc-base
-BuildRequires: xorg-xserver-Xvfb
-%endif
%{?with_system_xt:BuildRequires: xt}
BuildRequires: zip
BuildRequires: zlib-devel
@@ -2192,7 +2181,6 @@
%endif
--with-docdir=%{_docdir}/%{name}-%{version} \
--with-python=%{__python} \
- --with-openclipart=%{_datadir}/openclipart \
--with-stlport=/usr \
--with-x \
--without-fonts \
@@ -3808,6 +3796,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.722 2007/03/08 16:21:40 glen
+- openclipart gallery built externally, no more at install stage; rel 5
+
Revision 1.721 2007/03/08 02:58:37 glen
- plugin needs to be in ooo dir
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.721&r2=1.722&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
