From c9a0ba5831ab854733195066b844b7c015169722 Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@fedoraproject.org>
Date: Apr 15 2007 21:34:08 +0000
Subject: - Use the system default bookmarks

- Remove no longer needed autotools BRs

---

diff --git a/epiphany-2.18.1-default-bookmarks.patch b/epiphany-2.18.1-default-bookmarks.patch
new file mode 100644
index 0000000..a87db09
--- /dev/null
+++ b/epiphany-2.18.1-default-bookmarks.patch
@@ -0,0 +1,24 @@
+--- epiphany-2.18.1/src/bookmarks/ephy-bookmarks.c.default-bookmarks	2007-03-11 15:58:34.000000000 -0400
++++ epiphany-2.18.1/src/bookmarks/ephy-bookmarks.c	2007-04-15 17:27:13.000000000 -0400
+@@ -167,20 +167,7 @@
+ static void
+ ephy_bookmarks_init_defaults (EphyBookmarks *eb)
+ {
+-	int i;
+-
+-	for (i = 0; i < G_N_ELEMENTS (default_topics); i++)
+-	{
+-		ephy_bookmarks_add_keyword (eb, _(default_topics[i]));
+-	}
+-
+-	for (i = 0; i < G_N_ELEMENTS (default_bookmarks); i++)
+-	{
+-		EphyNode *bmk;
+-
+-		bmk = ephy_bookmarks_add (eb, _(default_bookmarks[i].title),
+-					  _(default_bookmarks[i].location));
+-	}
++	ephy_bookmarks_import_mozilla (eb, "/usr/share/bookmarks/default-bookmarks.html");
+ }
+ 
+ static void
diff --git a/epiphany.spec b/epiphany.spec
index 5d87d93..e46b6e3 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -9,7 +9,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.18.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -39,10 +39,6 @@ BuildRequires: gnome-desktop-devel
 BuildRequires: startup-notification-devel
 BuildRequires: gettext-devel
 BuildRequires: perl(XML::Parser)
-# For patch2 
-BuildRequires: automake autoconf libtool
-Source1: gnome-common.m4
-Source2: gnome-compiler-flags.m4
 %ifnarch s390 s390x
 BuildRequires: NetworkManager-devel
 %endif
@@ -51,6 +47,7 @@ BuildRequires: pygtk2-devel, gnome-python2-devel
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
 Patch1: epiphany-2.17.3-use-pango.patch
+Patch2: epiphany-2.18.1-default-bookmarks.patch
 
 %description
 epiphany is a simple GNOME web browser based on the Mozilla rendering
@@ -87,15 +84,13 @@ Install epiphany-devel if you want to write extensions for epiphany.
 
 %patch0 -p1 -b .homepage
 %patch1 -p1 -b .use-pango
+%patch2 -p1 -b .default-bookmarks
 
 %build
 %ifnarch s390 s390x
 %define enable_nm --enable-network-manager
 %endif
 
-cp -a %{SOURCE1} %{SOURCE2} m4/
-autoreconf
-
 %configure --disable-scrollkeeper --enable-zeroconf --enable-python %{enable_nm} 
 make %{?_smp_mflags}
 
@@ -183,6 +178,10 @@ fi
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Sun Apr 15 2007 Christopher Aillon <caillon@redhat.com> 2.18.1-2
+- Use the system default bookmarks
+- Remove no longer needed autotools BRs
+
 * Tue Apr 10 2007 Christopher Aillon <caillon@redhat.com> 2.18.1-1
 - Update to 2.18.1