SPECS (AC-branch): yelp.spec - dropped mozilla_firefox bcond, fire...

[hawk]

Author: hawk                         Date: Thu Jan 25 13:21:01 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- dropped mozilla_firefox bcond, firefox no longer provides devel package

---- Files affected:
SPECS:
   yelp.spec (1.75.4.16 -> 1.75.4.17) 

---- Diffs:

================================================================
Index: SPECS/yelp.spec
diff -u SPECS/yelp.spec:1.75.4.16 SPECS/yelp.spec:1.75.4.17
--- SPECS/yelp.spec:1.75.4.16	Wed Jan  3 19:24:38 2007
+++ SPECS/yelp.spec	Thu Jan 25 14:20:56 2007
@@ -2,7 +2,6 @@
 #
 # Conditinal build:
 %bcond_without	beagle			# build without beagle support 
-%bcond_with	mozilla_firefox		# build without mozilla-firefox
 #
 %ifarch alpha i386 sparc sparc64 
 %undefine	with_beagle
@@ -36,11 +35,7 @@
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 2.6.21
 BuildRequires:	libxslt-devel >= 1.1.5
-%if %{with mozilla_firefox}
-BuildRequires:	mozilla-firefox-devel
-%else
 BuildRequires:	xulrunner-devel >= 1.8.0.4
-%endif
 BuildRequires:	pkgconfig >= 1:0.15.0
 BuildRequires:	popt-devel
 BuildRequires:	rpmbuild(macros) >= 1.311
@@ -51,11 +46,7 @@
 Requires:	gnome-vfs2 >= 2.14.2
 Requires:	libgnomeui >= 2.14.1
 Requires:	scrollkeeper
-%if %{with mozilla_firefox}
-%requires_eq	mozilla-firefox
-%else
 %requires_eq	xulrunner
-%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # can be provided by mozilla or mozilla-embedded
@@ -82,11 +73,7 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	%if %{with mozilla_firefox}
-	--with-gecko=firefox
-	%else
 	--with-gecko=xulrunner
-	%endif
 %{__make}
 
 %install
@@ -128,6 +115,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.75.4.17  2007/01/25 13:20:56  hawk
+- dropped mozilla_firefox bcond, firefox no longer provides devel package
+
 Revision 1.75.4.16  2007/01/03 18:24:38  hawk
 - specify which mozilla to use for compilation, autodetect fails with
   more than one gecko installed
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/yelp.spec?r1=1.75.4.16&r2=1.75.4.17&f=u