Author: hawk Date: Thu Jan 25 13:18:42 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- dropped mozilla_firefox bcond, firefox no longer provides devel package
---- Files affected:
SPECS:
epiphany-extensions.spec (1.47.2.15 -> 1.47.2.16)
---- Diffs:
================================================================
Index: SPECS/epiphany-extensions.spec
diff -u SPECS/epiphany-extensions.spec:1.47.2.15
SPECS/epiphany-extensions.spec:1.47.2.16
--- SPECS/epiphany-extensions.spec:1.47.2.15 Wed Jan 3 19:43:10 2007
+++ SPECS/epiphany-extensions.spec Thu Jan 25 14:18:37 2007
@@ -1,8 +1,5 @@
# $Revision$, $Date$
#
-# Conditional build:
-%bcond_with mozilla_firefox # build with mozilla instead of mozilla-firefox
-#
%define basever 2.14
Summary: Collection of extensions for Epiphany
Summary(pl): Zbiór rozszerzeń dla Epiphany
@@ -25,22 +22,14 @@
BuildRequires: libgnomeui-devel >= 2.14.0
BuildRequires: libtool
BuildRequires: libxml2-devel >= 1:2.6.22
-%if %{with mozilla_firefox}
-BuildRequires: mozilla-firefox-devel
-%else
BuildRequires: xulrunner-devel >= 1.8.0.4
-%endif
BuildRequires: opensp-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: python-gnome-devel >= 2.12.0
Requires(post,postun): scrollkeeper
Requires: epiphany = %(rpm -q --qf '%{EPOCH}:%{VERSION}' epiphany-devel)
-%if %{with mozilla_firefox}
-%requires_eq mozilla-firefox
-%else
%requires_eq xulrunner
-%endif
Provides: epiphany-plugins
Obsoletes: epiphany-plugins <= 0.1.2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -66,11 +55,7 @@
%{__automake}
%configure \
--with-extensions=really-all \
- %if %{with mozilla_firefox}
- --with-gecko=firefox \
- %else
--with-gecko=xulrunner \
- %endif
--disable-scrollkeeper
%{__make}
@@ -110,6 +95,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47.2.16 2007/01/25 13:18:37 hawk
+- dropped mozilla_firefox bcond, firefox no longer provides devel package
+
Revision 1.47.2.15 2007/01/03 18:43:10 hawk
- specify which mozilla to use for compilation, autodetect fails with
more than one gecko installed
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/epiphany-extensions.spec?r1=1.47.2.15&r2=1.47.2.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
