Accepting request 203405 from home:dimstar:branches:GNOME:Factory

Update to 3.10.1 - GNOME Stable branch - Bugfixing only and translations.

OBS-URL: https://build.opensuse.org/request/show/203405
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=173

epiphany-3.10.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7bd2c3b21464a83909d75befe2f9501c1ab2f00e2371f26023f79818faec351e
-size 3085076

epiphany-3.10.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86c680b4b12432b18cbb8e7dec25b26586a536cb5842027db2e6986f416ddfad
+size 3087644

epiphany-fix-nonvoid.patch

@@ -1,24 +0,0 @@
-From d95e5525ce70f768c9e0986588df26ec17b83adb Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Sat, 21 Sep 2013 13:41:40 +0200
-Subject: [PATCH] fix no-return-in-nonvoid function
-
----
- src/ephy-navigation-history-action.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ephy-navigation-history-action.c b/src/ephy-navigation-history-action.c
-index 4f7f1c9..c7d7c37 100644
---- a/src/ephy-navigation-history-action.c
-+++ b/src/ephy-navigation-history-action.c
-@@ -656,6 +656,7 @@ tool_button_press_event_cb (GtkButton *button,
-     popup_history_menu (action, GTK_WIDGET (button), event);
-     return TRUE;
-   }
-+  return FALSE;
- }
- 
- static gboolean
--- 
-1.8.4
-

epiphany.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Oct 15 14:29:26 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.10.1:
+  + Bugs fixed: bgo#708550, bgo#708461.
+  + Updated translations.
+- Drop epiphany-fix-nonvoid.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Tue Sep 24 16:21:38 UTC 2013 - dimstar@opensuse.org
 

epiphany.spec

@@ -17,7 +17,7 @@
 
 
 Name:           epiphany
-Version:        3.10.0
+Version:        3.10.1
 Release:        0
 %define _base_version 3.10
 Summary:        GNOME Web Browser
@@ -27,8 +27,6 @@ Url:            http://www.gnome.org/projects/epiphany/
 Source:         http://download.gnome.org/sources/epiphany/3.10/%{name}-%{version}.tar.xz
 # PATCH-FEATURE-OPENSUSE epiphany-safe-one-click-install.patch bnc330070 vuntz@novell.com -- Make one-click install work with one-click
 Patch0:         epiphany-safe-one-click-install.patch
-# PATCH-FIX-UPSTREAM epiphany-fix-nonvoid.patch bgo#708461 dimstar@opensuse.org -- Fix non-void function not returning value
-Patch1:         epiphany-fix-nonvoid.patch
 BuildRequires:  fdupes
 BuildRequires:  gnome-icon-theme
 BuildRequires:  intltool >= 0.50
@@ -105,7 +103,6 @@ string.
 %setup -q
 translation-update-upstream
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure \