Author: glen Date: Thu Mar 8 13:25:09 2007 GMT Module: SPECS Tag: AC-branch ---- Log message: - openclipart gallery built externally, no more at install stage; rel 5
---- Files affected: SPECS: openoffice.org.spec (1.704.2.20 -> 1.704.2.21) ---- Diffs: ================================================================ Index: SPECS/openoffice.org.spec diff -u SPECS/openoffice.org.spec:1.704.2.20 SPECS/openoffice.org.spec:1.704.2.21 --- SPECS/openoffice.org.spec:1.704.2.20 Thu Mar 8 03:19:14 2007 +++ SPECS/openoffice.org.spec Thu Mar 8 14:25:03 2007 @@ -15,9 +15,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 @@ -43,7 +40,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 @@ -68,7 +64,7 @@ %endif %define ver 2.1.0 -%define _rel 4 +%define _rel 5 %define subver 680 %define snap OOE680 %define snap2 SRC680 @@ -134,7 +130,6 @@ 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 @@ -177,7 +172,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 @@ -2182,7 +2176,6 @@ %endif --with-docdir=%{_docdir}/%{name}-%{version} \ --with-python=%{__python} \ - --with-openclipart=%{_datadir}/openclipart \ --with-stlport=/usr \ --with-x \ --without-fonts \ @@ -3801,6 +3794,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.704.2.21 2007/03/08 13:25:03 glen +- openclipart gallery built externally, no more at install stage; rel 5 + Revision 1.704.2.20 2007/03/08 02:19:14 glen - skip dictionaries install if system dicts are used ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.704.2.20&r2=1.704.2.21&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
