Author: hawk Date: Thu Jan 25 13:15:41 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- dropped mozilla_firefox bcond, firefox no longer provides devel package
---- Files affected:
SPECS:
epiphany.spec (1.107.2.17 -> 1.107.2.18)
---- Diffs:
================================================================
Index: SPECS/epiphany.spec
diff -u SPECS/epiphany.spec:1.107.2.17 SPECS/epiphany.spec:1.107.2.18
--- SPECS/epiphany.spec:1.107.2.17 Sun Jan 7 19:01:51 2007
+++ SPECS/epiphany.spec Thu Jan 25 14:15:36 2007
@@ -1,6 +1,4 @@
# $Revision$, $Date$
-# Conditinal build:
-%bcond_with mozilla_firefox # build without mozilla-firefox-devel
#
%define basever 2.14
Summary: Epiphany - gecko-based GNOME web browser
@@ -40,12 +38,8 @@
BuildRequires: libtool
BuildRequires: libxslt-devel >= 1.1.15
BuildRequires: startup-notification-devel >= 0.5
-%if %{with mozilla_firefox}
-BuildRequires: mozilla-firefox-devel >= 2.0-2
-%else
BuildRequires: xulrunner >= 1.8.0.4
BuildRequires: xulrunner-devel >= 1.8.0.4
-%endif
BuildRequires: pkgconfig
BuildRequires: python-gnome-devel >= 2.6.0
BuildRequires: python-pygtk-devel >= 2.6.0
@@ -58,11 +52,7 @@
Requires: gnome-icon-theme >= 2.14.0
Requires: gtk+2 >= 2:2.8.18
Requires: libgnomeui >= 2.14.1
-%if %{with mozilla_firefox}
-%requires_eq mozilla-firefox
-%else
%requires_eq xulrunner
-%endif
Obsoletes: python-epiphany
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -124,11 +114,7 @@
--enable-dbus \
--enable-gtk-doc \
--enable-python \
- %if %{with mozilla_firefox}
- --with-gecko=firefox \
- %else
--with-gecko=xulrunner \
- %endif
--with-html-dir=%{_gtkdocdir}
# CFLAGS is a hack for gcc 3.3
%{__make} \
@@ -203,6 +189,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.107.2.18 2007/01/25 13:15:36 hawk
+- dropped mozilla_firefox bcond, firefox no longer provides devel package
+
Revision 1.107.2.17 2007/01/07 18:01:51 glen
- adapter
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/epiphany.spec?r1=1.107.2.17&r2=1.107.2.18&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
