SPECS: openoffice.org.spec - build with xulrunner

[glen]

Author: glen                         Date: Sat Feb 24 11:47:02 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build with xulrunner

---- Files affected:
SPECS:
   openoffice.org.spec (1.698 -> 1.699) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.698 SPECS/openoffice.org.spec:1.699
--- SPECS/openoffice.org.spec:1.698	Tue Feb 13 08:16:51 2007
+++ SPECS/openoffice.org.spec	Sat Feb 24 12:46:57 2007
@@ -1,4 +1,12 @@
 # $Revision$, $Date$
+#
+#
+#RPM build errors:
+#    File not found: /home/glen/tmp/openoffice.org-2.1.0-root-glen/usr/lib/openoffice.org/program/classes/serializer.jar
+#    File not found: /home/glen/tmp/openoffice.org-2.1.0-root-glen/usr/lib/openoffice.org/program/classes/xalan.jar
+#    File not found: /home/glen/tmp/openoffice.org-2.1.0-root-glen/usr/lib/openoffice.org/program/classes/xercesImpl.jar
+#    File not found: /home/glen/tmp/openoffice.org-2.1.0-root-glen/usr/lib/openoffice.org/program/classes/xml-apis.jar
+#Error: package build failed. (no more info)
 # NOTE:
 #	- normal build with java requires about 24GB of disk space
 #		$BUILD_ROOT	 7.1 GB
@@ -44,8 +52,7 @@
 %bcond_without	java		# without Java support (disables help support)
 %bcond_without	kde		# KDE L&F packages
 %bcond_with	mono		# enable compilation of mono bindings
-%bcond_without	mozilla		# without mozilla
-%bcond_with	seamonkey	# use seamonkey instead of firefox
+%bcond_without	mozilla		# without mozilla components
 %bcond_without	i18n		# do not create i18n packages
 
 %bcond_without	system_beanshell
@@ -68,7 +75,7 @@
 %endif
 
 %define		ver		2.1.0
-%define		_rel		0.17
+%define		_rel		0.18
 %define		subver		680
 %define		snap		OOE680
 %define		snap2		SRC680
@@ -126,7 +133,6 @@
 Patch101:	%{name}-64bit-inline.diff
 Patch102:	%{name}-build-pld-splash.diff
 Patch104:	%{name}-portaudio_v19.diff
-Patch105:	%{name}-firefox.diff
 Patch106:	%{name}-seamonkey.diff
 Patch107:	%{name}-stl-amd64.patch
 URL:		http://www.openoffice.org/
@@ -223,11 +229,7 @@
 %else
 BuildRequires:	libxslt-progs
 %endif
-%if %{with seamonkey}
-BuildRequires:	seamonkey-devel
-%else
-BuildRequires:	mozilla-firefox-devel
-%endif
+BuildRequires:	xulrunner-devel
 BuildConflicts:	STLport4
 Requires:	%{name}-base = %{epoch}:%{version}-%{release}
 Requires:	%{name}-calc = %{epoch}:%{version}-%{release}
@@ -2049,7 +2051,7 @@
 
 echo "[ PLDOnly ]" >> patches/src680/apply
 # patches applied by ooo (extension .diff is required)
-for P in %{PATCH102} %{PATCH104} %{PATCH105} %{PATCH106}; do
+for P in %{PATCH102} %{PATCH104} %{PATCH106}; do
 	PATCHNAME=PLD-${P##*/%{name}-}
 	PATCHNAME=${PATCHNAME%.patch}.diff
 	install $P patches/src680/$PATCHNAME
@@ -2151,11 +2153,7 @@
 	--with-system-xmlsec \
 %if %{with mozilla}
 	--with-system-mozilla \
-%if %{with seamonkey}
-	--with-seamonkey \
-%else
-	--with-firefox \
-%endif
+	--with-xulrunner \
 %else
 	--disable-mozilla \
 %endif
@@ -3765,6 +3763,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.699  2007/02/24 11:46:57  glen
+- build with xulrunner
+
 Revision 1.698  2007/02/13 07:16:51  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.698&r2=1.699&f=u