From 0e452bfb88ad197163538fede15b1a1a37aeedd47b3a98fc50d96182fcef5422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 15 Oct 2013 15:11:57 +0000 Subject: [PATCH] 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 | 3 --- epiphany-3.10.1.tar.xz | 3 +++ epiphany-fix-nonvoid.patch | 24 ------------------------ epiphany.changes | 8 ++++++++ epiphany.spec | 5 +---- 5 files changed, 12 insertions(+), 31 deletions(-) delete mode 100644 epiphany-3.10.0.tar.xz create mode 100644 epiphany-3.10.1.tar.xz delete mode 100644 epiphany-fix-nonvoid.patch diff --git a/epiphany-3.10.0.tar.xz b/epiphany-3.10.0.tar.xz deleted file mode 100644 index 1b1c5b1..0000000 --- a/epiphany-3.10.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bd2c3b21464a83909d75befe2f9501c1ab2f00e2371f26023f79818faec351e -size 3085076 diff --git a/epiphany-3.10.1.tar.xz b/epiphany-3.10.1.tar.xz new file mode 100644 index 0000000..9205965 --- /dev/null +++ b/epiphany-3.10.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86c680b4b12432b18cbb8e7dec25b26586a536cb5842027db2e6986f416ddfad +size 3087644 diff --git a/epiphany-fix-nonvoid.patch b/epiphany-fix-nonvoid.patch deleted file mode 100644 index bcfe8f7..0000000 --- a/epiphany-fix-nonvoid.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d95e5525ce70f768c9e0986588df26ec17b83adb Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -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 - diff --git a/epiphany.changes b/epiphany.changes index 83a205a..6c128c3 100644 --- a/epiphany.changes +++ b/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 diff --git a/epiphany.spec b/epiphany.spec index d572607..cab7896 100644 --- a/epiphany.spec +++ b/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 \