Author: hawk Date: Thu Jan 25 13:24:03 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- dropped mozilla_firefox bcond, firefox no longer provides devel package
---- Files affected:
SPECS:
galeon.spec (1.251.2.3 -> 1.251.2.4)
---- Diffs:
================================================================
Index: SPECS/galeon.spec
diff -u SPECS/galeon.spec:1.251.2.3 SPECS/galeon.spec:1.251.2.4
--- SPECS/galeon.spec:1.251.2.3 Wed Jan 3 17:47:36 2007
+++ SPECS/galeon.spec Thu Jan 25 14:23:58 2007
@@ -1,7 +1,6 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_with mozilla_firefox # build without mozilla-firefox-devel
%bcond_with nautilus # disable nautilus view
%bcond_with gcc2 # compile using gcc2 to get working
gcc2-compiled java
# plugin (better get gcc3-compiled one).
@@ -47,11 +46,7 @@
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: libxml2-devel >= 2.6.6
-%if %{with mozilla_firefox}
-BuildRequires: mozilla-firefox-devel
-%else
BuildRequires: xulrunner-devel >= 1.8.0.4
-%endif
%{?with_nautilus:BuildRequires: nautilus-devel >= 2.4.0}
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.197
@@ -62,11 +57,7 @@
Requires: glib2 >= 1:2.4.4
Requires: gtk+2 >= 2:2.4.4
Requires: libbonobo >= 2.4.0
-%if %{with mozilla_firefox}
-%requires_eq mozilla-firefox
-%else
%requires_eq xulrunner
-%endif
Provides: wwwbrowser
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -117,11 +108,7 @@
%else
--enable-nautilus-view=no \
%endif
- %if %{with mozilla_firefox}
- --with-mozilla=firefox
- %else
--with-mozilla=xulrunner
- %endif
%{__make}
%install
@@ -175,6 +162,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.251.2.4 2007/01/25 13:23:58 hawk
+- dropped mozilla_firefox bcond, firefox no longer provides devel package
+
Revision 1.251.2.3 2007/01/03 16:47:36 hawk
- specify which mozilla to use, autodetection always choose firefox if
few mozilla devel packages co-exist in system
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/galeon.spec?r1=1.251.2.3&r2=1.251.2.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
