SPECS (AC-branch): epiphany.spec - specify which mozilla to use fo...

[hawk]

Author: hawk                         Date: Wed Jan  3 18:28:11 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- specify which mozilla to use for compilation, autodetect fails with
  more than one gecko installed
- fixed compilation error with gecko 1.8.1

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

---- Diffs:

================================================================
Index: SPECS/epiphany.spec
diff -u SPECS/epiphany.spec:1.107.2.14 SPECS/epiphany.spec:1.107.2.15
--- SPECS/epiphany.spec:1.107.2.14	Mon Jan  1 20:29:41 2007
+++ SPECS/epiphany.spec	Wed Jan  3 19:28:06 2007
@@ -19,6 +19,7 @@
 Patch3:		%{name}-pld-homepage.patch
 Patch4:		%{name}-configure.patch
 Patch5:		%{name}-no_typeaheadfind_check.patch
+Patch6:		%{name}-gecko-1_8_1-fix.patch
 URL:		http://www.gnome.org/projects/epiphany/
 BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	ORBit2-devel >= 1:2.14.0
@@ -103,6 +104,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p0
+%patch6 -p1
 
 %build
 gnome-doc-prepare --copy --force
@@ -120,6 +122,11 @@
 	--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} \
@@ -194,6 +201,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.107.2.15  2007/01/03 18:28:06  hawk
+- specify which mozilla to use for compilation, autodetect fails with
+  more than one gecko installed
+- fixed compilation error with gecko 1.8.1
+
 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
================================================================

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