rpms/openoffice.org/devel openoffice.org.spec,1.1340,1.1341

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
move from firefox to xulrunner


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1340
retrieving revision 1.1341
diff -u -r1.1340 -r1.1341
--- openoffice.org.spec	14 Nov 2007 11:29:06 -0000	1.1340
+++ openoffice.org.spec	15 Nov 2007 08:00:43 -0000	1.1341
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 9
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -73,7 +73,7 @@
 BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel
 BuildRequires:	libjpeg-devel, sane-backends-devel, libICE-devel, hunspell-devel
 BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
-BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, xerces-j2
+BuildRequires:  libxslt-devel, db4-devel, xulrunner-devel, libwpd-devel, xerces-j2
 BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
 BuildRequires:  perl-Archive-Zip, libtextcat-devel, nss-devel >= 3.11.7-8
 
@@ -1114,7 +1114,7 @@
 cd config_office
 autoconf
 export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdkflags} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}"!
  --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdkflags} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=xulrunner --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs!
 }" --with-poor-help-localizations="$POORHELPS"
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -2795,6 +2795,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Nov 15 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.2
+- move from firefox to xulrunner
+
 * Wed Nov 14 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.1
 - 2.3.1 pre-release candidate m9
 - tweak mime information and desktop files to support .oxt extensions