SPECS (AC-branch): devhelp.spec - dropped mozilla_firefox bcond, f...

[hawk]

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

---- Files affected:
SPECS:
   devhelp.spec (1.53.2.10 -> 1.53.2.11) 

---- Diffs:

================================================================
Index: SPECS/devhelp.spec
diff -u SPECS/devhelp.spec:1.53.2.10 SPECS/devhelp.spec:1.53.2.11
--- SPECS/devhelp.spec:1.53.2.10	Wed Jan  3 19:44:55 2007
+++ SPECS/devhelp.spec	Thu Jan 25 14:08:44 2007
@@ -1,7 +1,5 @@
 # $Revision$, $Date$
 #
-# Conditional build:
-%bcond_with	mozilla_firefox	# build with mozilla-firefox-devel
 #
 Summary:	DevHelp is a developer's help program for GNOME
 Summary(pl):	Program pomocy dla programistów GNOME
@@ -26,21 +24,13 @@
 BuildRequires:	gtk+2-devel >= 2:2.6.4
 BuildRequires:	libglade2-devel >= 1:2.5.1
 BuildRequires:	libtool
-%if %{with mozilla_firefox}
-BuildRequires:	mozilla-firefox-devel
-%else
 BuildRequires:	xulrunner-devel >= 1.8.0.4
-%endif
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	zlib-devel
 Requires(post,preun):	GConf2
 Requires:	%{name}-libs = %{version}-%{release}
-%if %{with mozilla_firefox}
-%requires_eq	mozilla-firefox-libs
-%else
 %requires_eq	xulrunner-libs
-%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # can be provided by mozilla or mozilla-embedded
@@ -103,11 +93,7 @@
 %{__automake}
 %configure \
 	--disable-install-schemas \
-	%if %{with mozilla_firefox}
-	--with-mozilla=firefox
-	%else
 	--with-mozilla=xulrunner
-	%endif
 %{__make}
 
 %install
@@ -166,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53.2.11  2007/01/25 13:08:44  hawk
+- dropped mozilla_firefox bcond, firefox no longer provides devel package
+
 Revision 1.53.2.10  2007/01/03 18:44:55  hawk
 - fixed xulrunner-libs R
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/devhelp.spec?r1=1.53.2.10&r2=1.53.2.11&f=u