SPECS (AC-branch): epiphany.spec - mozilla is dead, replaced mozil...

[hawk]

Author: hawk                         Date: Mon Jan  1 19:29:47 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- mozilla is dead, replaced mozilla deps with xulrunner deps
- build against xulrunner by default
- added ugly hack to make it compile with xulrunner/firefox2
- release 7

---- Files affected:
SPECS:
   epiphany.spec (1.107.2.13 -> 1.107.2.14) 

---- Diffs:

================================================================
Index: SPECS/epiphany.spec
diff -u SPECS/epiphany.spec:1.107.2.13 SPECS/epiphany.spec:1.107.2.14
--- SPECS/epiphany.spec:1.107.2.13	Mon Dec 18 18:44:23 2006
+++ SPECS/epiphany.spec	Mon Jan  1 20:29:41 2007
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 # Conditinal build:
-%bcond_without	mozilla_firefox	# build without mozilla-firefox-devel
+%bcond_with	mozilla_firefox	# build without mozilla-firefox-devel
 #
 %define		basever	2.14
 Summary:	Epiphany - gecko-based GNOME web browser
@@ -8,7 +8,7 @@
 Summary(pl):	Epiphany - przeglądarka WWW dla GNOME
 Name:		epiphany
 Version:	2.14.3
-Release:	6.1
+Release:	7
 License:	GPL v2
 Group:		X11/Applications/Networking
 Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany/%{basever}/%{name}-%{version}.tar.bz2
@@ -18,6 +18,7 @@
 Patch2:		%{name}-mozilla_includes.patch
 Patch3:		%{name}-pld-homepage.patch
 Patch4:		%{name}-configure.patch
+Patch5:		%{name}-no_typeaheadfind_check.patch
 URL:		http://www.gnome.org/projects/epiphany/
 BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	ORBit2-devel >= 1:2.14.0
@@ -41,7 +42,7 @@
 %if %{with mozilla_firefox}
 BuildRequires:	mozilla-firefox-devel >= 2.0-2
 %else
-BuildRequires:	mozilla-devel >= 5:1.7.9
+BuildRequires:	xulrunner-devel >= 1.8.0.4
 %endif
 BuildRequires:	pkgconfig
 BuildRequires:	python-gnome-devel >= 2.6.0
@@ -58,7 +59,7 @@
 %if %{with mozilla_firefox}
 %requires_eq	mozilla-firefox
 %else
-Requires:	mozilla-embedded = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla-embedded)
+%requires_eq	xulrunner
 %endif
 Obsoletes:	python-epiphany
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -101,6 +102,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p0
 
 %build
 gnome-doc-prepare --copy --force
@@ -192,6 +194,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.107.2.14  2007/01/01 19:29:41  hawk
+- mozilla is dead, replaced mozilla deps with xulrunner deps
+- build against xulrunner by default
+- added ugly hack to make it compile with xulrunner/firefox2
+- release 7
+
 Revision 1.107.2.13  2006/12/18 17:44:23  baggins
 - rel 6.1
 - working out firefox problems
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/epiphany.spec?r1=1.107.2.13&r2=1.107.2.14&f=u