SPECS (AC-branch): openoffice.org.spec - amd64 fix from HEAD - use...

[glen]

Author: glen                         Date: Tue Jan  2 22:22:07 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- amd64 fix from HEAD
- use mozilla-firefox-devel

---- Files affected:
SPECS:
   openoffice.org.spec (1.605.2.3 -> 1.605.2.4) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.605.2.3 SPECS/openoffice.org.spec:1.605.2.4
--- SPECS/openoffice.org.spec:1.605.2.3	Sun Aug  6 21:27:51 2006
+++ SPECS/openoffice.org.spec	Tue Jan  2 23:22:01 2007
@@ -32,7 +32,7 @@
 %bcond_with	vfs		# Enable GNOME VFS and Evolution 2 support
 %bcond_with	mono		# enable compilation of mono bindings
 %bcond_without	java		# without Java support (disables help support)
-%bcond_without	mozilla		# without mozilla
+%bcond_without	mozilla		# without mozilla-firefox
 
 %define		ver		2.0
 %define		rel		3
@@ -89,7 +89,7 @@
 BuildRequires:	ImageMagick
 BuildRequires:	STLport-devel >= 4.5.3-6
 %if %{with mozilla}
-BuildRequires:	mozilla-devel >= 5:1.7.6-2
+BuildRequires:	mozilla-firefox-devel
 %endif
 BuildRequires:	XFree86-devel
 BuildRequires:	XFree86-Xvfb
@@ -1911,7 +1911,7 @@
 
 :> distro-configs/Common.conf
 :> distro-configs/Common.conf.in
-echo "$CONFOPTS" > distro-configs/${DISTRO}.conf.in
+echo "$CONFOPTS" > distro-configs/PLD.conf.in
 
 # for cvs snaps
 [ -x ./autogen.sh ] && ./autogen.sh $CONFOPTS
@@ -2320,6 +2320,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.605.2.4  2007/01/02 22:22:01  glen
+- amd64 fix from HEAD
+- use mozilla-firefox-devel
+
 Revision 1.605.2.3  2006/08/06 19:27:51  adamg
 - todo: 2 new entries, one entry removed
 - description for mono bcond
================================================================

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