[epiphany/f20-gnome-3-12] Sync with rawhide

[Kalev Lember]

commit 65e5dba486be4c6da02ddee47523c970c4b5f20b
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed May 7 11:08:32 2014 +0200

    Sync with rawhide

 epiphany-default-bookmarks.patch |   31 ++++++++++++++-----------------
 epiphany.spec                    |   27 ++++++++++++++++++++-------
 2 files changed, 34 insertions(+), 24 deletions(-)
---
diff --git a/epiphany-default-bookmarks.patch b/epiphany-default-bookmarks.patch
index acd0603..b04bbb7 100644
--- a/epiphany-default-bookmarks.patch
+++ b/epiphany-default-bookmarks.patch
@@ -1,19 +1,16 @@
-diff -up epiphany-2.27.90/src/bookmarks/ephy-bookmarks.c.default-bookmarks epiphany-2.27.90/src/bookmarks/ephy-bookmarks.c
---- epiphany-2.27.90/src/bookmarks/ephy-bookmarks.c.default-bookmarks	2009-07-30 07:03:37.000000000 -0400
-+++ epiphany-2.27.90/src/bookmarks/ephy-bookmarks.c	2009-08-12 13:02:36.290404807 -0400
-@@ -130,14 +130,7 @@ G_DEFINE_TYPE_WITH_CODE (EphyBookmarks, 
- static void
- ephy_bookmarks_init_defaults (EphyBookmarks *eb)
+diff -up epiphany-3.11.92/src/bookmarks/ephy-bookmarks.c.default-bookmarks epiphany-3.11.92/src/bookmarks/ephy-bookmarks.c
+--- epiphany-3.11.92/src/bookmarks/ephy-bookmarks.c.default-bookmarks	2014-02-04 10:55:03.000000000 -0500
++++ epiphany-3.11.92/src/bookmarks/ephy-bookmarks.c	2014-03-20 12:50:04.377875262 -0400
+@@ -116,6 +116,12 @@ ephy_bookmarks_init_defaults (EphyBookma
  {
--	int i;
--
--	for (i = 0; i < G_N_ELEMENTS (default_topics); i++)
--	{
--		ephy_bookmarks_add_keyword (eb, _(default_topics[i]));
--	}
--
--	ephy_bookmarks_import_rdf (eb, DATADIR "/default-bookmarks.rdf");
-+	ephy_bookmarks_import_mozilla (eb, "/usr/share/bookmarks/default-bookmarks.html");
- }
+ 	int i;
  
- static void
++	if (g_file_test ("/usr/share/bookmarks/default-bookmarks.html", G_FILE_TEST_EXISTS))
++	{
++		ephy_bookmarks_import_mozilla (eb, "/usr/share/bookmarks/default-bookmarks.html");
++		return;
++	}
++
+ 	for (i = 0; i < G_N_ELEMENTS (default_topics); i++)
+ 	{
+ 		ephy_bookmarks_add_keyword (eb, _(default_topics[i]));
diff --git a/epiphany.spec b/epiphany.spec
index 18f2ed1..535b6a6 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -14,6 +14,7 @@ Requires(postun): desktop-file-utils
 
 Requires: gnome-icon-theme
 Requires: iso-codes
+Requires: %{name}-runtime
 
 BuildRequires: gcr-devel >= 3.5.5
 BuildRequires: glib2-devel >= 2.31.2
@@ -52,6 +53,12 @@ simple and easy to use. Epiphany ties together many GNOME components
 in order to let you focus on the Web content, instead of the browser
 application.
 
+%package runtime
+Summary: Epiphany runtime suitable for web applications
+
+%description runtime
+This package provides a runtime for web-applications without actually
+installing the epiphany application itself.
 
 %prep
 %setup -q
@@ -91,6 +98,19 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %files -f %{name}.lang
+%defattr(-,root,root,-)
+%{_libexecdir}/epiphany-search-provider
+%dir %{_datadir}/appdata/
+%{_datadir}/appdata/epiphany.appdata.xml
+%{_datadir}/applications/epiphany.desktop
+%dir %{_datadir}/gnome-shell/
+%dir %{_datadir}/gnome-shell/search-providers/
+%{_datadir}/gnome-shell/search-providers/epiphany-search-provider.ini
+%{_datadir}/dbus-1/services/org.gnome.Epiphany.service
+
+
+%files runtime
+%defattr(-,root,root,-)
 %doc README NEWS COPYING COPYING.README AUTHORS
 %{_datadir}/glib-2.0/schemas/org.gnome.epiphany.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.Epiphany.enums.xml
@@ -98,15 +118,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_bindir}/epiphany
 %{_bindir}/ephy-profile-migrator
 %{_libdir}/epiphany/
-%dir %{_datadir}/appdata/
-%{_datadir}/appdata/epiphany.appdata.xml
-%{_datadir}/applications/epiphany.desktop
 %{_datadir}/epiphany
-%dir %{_datadir}/gnome-shell/
-%dir %{_datadir}/gnome-shell/search-providers/
-%{_datadir}/gnome-shell/search-providers/epiphany-search-provider.ini
 %{_mandir}/man*/*
-%{_datadir}/dbus-1/services/org.gnome.Epiphany.service
 
 
 %changelog