rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.12, 1.1440.2.13

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Tue Mar 11 08:54:31 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14503

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Log Message:
merge


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.12
retrieving revision 1.1440.2.13
diff -u -r1.1440.2.12 -r1.1440.2.13
--- openoffice.org.spec	10 Mar 2008 19:57:24 -0000	1.1440.2.12
+++ openoffice.org.spec	11 Mar 2008 08:53:55 -0000	1.1440.2.13
@@ -60,13 +60,13 @@
 BuildRequires:	binutils, %{java_devel}, boost-devel, zlib-devel, vigra-devel
 BuildRequires:	python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
 BuildRequires:	neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel
-BuildRequires:	libXt-devel, libICE-devel, libjpeg-devel, db4-devel
-BuildRequires:	xulrunner-devel, libwpd-devel, hunspell-devel, unixODBC-devel
-BuildRequires:	sane-backends-devel, libicu-devel, perl-Archive-Zip, gperf
+BuildRequires:	libXt-devel, libICE-devel, libjpeg-devel, db4-devel, gperf
+BuildRequires:	gecko-devel, libwpd-devel, hunspell-devel, unixODBC-devel
+BuildRequires:	sane-backends-devel, libicu-devel, perl-Archive-Zip
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, desktop-file-utils
 BuildRequires:	evolution-data-server-devel, libtextcat-devel, nss-devel
-BuildRequires:	gstreamer-devel, gstreamer-plugins-base-devel, hyphen-devel,
-BuildRequires:	openssl-devel, xalan-j2, xerces-j2, hsqldb, bsh, lpsolve-devel
+BuildRequires:	gstreamer-devel, gstreamer-plugins-base-devel, hyphen-devel
+BuildRequires:	openssl-devel, xalan-j2, xerces-j2, hsqldb, bsh
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  openoffice.org-multiliblauncher.sh
@@ -1105,7 +1105,7 @@
 cd config_office
 autoconf
 export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --with-vba-package-format="builtin" --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=xulrunner --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --with-vba-package-format="builtin" --enable-dbus --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh




More information about the fedora-extras-commits mailing list