Accepting request 562362 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/562362
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany?expand=0&rev=145

epiphany-3.26.3.tar.xz

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

epiphany-3.26.5.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b2f1c48e6f50793ff205d9215add5596ab5c7ebf4cef76907868fcd5a029221
+size 4418232

epiphany-application-mode-fix-desktopfile.patch

@@ -0,0 +1,32 @@
+From 967eec8db71ea9777765d1ffd8acf4196f9c37cb Mon Sep 17 00:00:00 2001
+From: Jonathan Kang <jonathan121537@gmail.com>
+Date: Fri, 29 Dec 2017 10:57:49 +0800
+Subject: application mode: use strstr() to get base name of the desktop file
+
+If the name of the web application include 'app', for expample
+'WhatsApp', it might cause users unable to open the web application
+any more.
+
+Fix that by using strstr() to get the base name of that desktop
+file instead of g_strrstr().
+
+https://bugzilla.gnome.org/show_bug.cgi?id=790781
+---
+ lib/ephy-web-app-utils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/ephy-web-app-utils.c b/lib/ephy-web-app-utils.c
+index 4e3b471..d3afff4 100644
+--- a/lib/ephy-web-app-utils.c
++++ b/lib/ephy-web-app-utils.c
+@@ -350,7 +350,7 @@ ephy_web_application_setup_from_profile_directory (const char *profile_directory
+ 
+   g_return_if_fail (profile_directory != NULL);
+ 
+-  app_name = g_strrstr (profile_directory, EPHY_WEB_APP_PREFIX);
++  app_name = strstr (profile_directory, EPHY_WEB_APP_PREFIX);
+   if (!app_name) {
+     g_warning ("Profile directory %s does not begin with required web app prefix %s", profile_directory, EPHY_WEB_APP_PREFIX);
+     exit (1);
+-- 
+cgit v0.12

epiphany.changes

@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Mon Jan  1 20:08:44 UTC 2018 - zaitor@opensuse.org
+
+- Add epiphany-application-mode-fix-desktopfile.patch: application
+  mode: use strstr() to get base name of the desktop file
+  (bgo#790781).
+
+-------------------------------------------------------------------
+Sat Dec 23 12:03:00 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 3.26.5.1:
+  + Correct logic to avoid corrupting session state.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Dec 18 16:28:08 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 3.26.5:
+  + Fix error in sync migration when migrating from 3.26.2 or
+    earlier.
+  + Improved logic to avoid corrupting session state.
+- Drop epiphany-session-rework-the-safety-check.patch: Fixed
+  upstream.
+
+-------------------------------------------------------------------
+Thu Dec 14 17:15:32 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 3.26.4:
+  + Fix sync failure warnings appearing multiple times
+    (bgo#790094).
+  + Fix tab sync and device name on accounts.firefox.com
+    (bgo#790370).
+  + Make default sync device name translatable (bgo#790905).
+  + Several additional misc. improvements to sync support
+    (including bgo#790819).
+  + Flatpak: custom stylesheets are now supported.
+  + Flatpak: view page source is now supported.
+- Add epiphany-session-rework-the-safety-check.patch: session:
+  Rework the safety check.
+
 -------------------------------------------------------------------
 Sun Nov 26 15:58:32 UTC 2017 - zaitor@opensuse.org
 

epiphany.spec

@@ -17,7 +17,7 @@
 
 
 Name:           epiphany
-Version:        3.26.3
+Version:        3.26.5.1
 Release:        0
 Summary:        GNOME Web Browser
 License:        GPL-3.0+
@@ -25,6 +25,9 @@ Group:          Productivity/Networking/Web/Browsers
 Url:            http://www.gnome.org/projects/epiphany/
 Source0:        http://download.gnome.org/sources/epiphany/3.26/%{name}-%{version}.tar.xz
 Source99:       %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM epiphany-application-mode-fix-desktopfile.patch bgo#790781 zaitor@opensuse.org -- application mode: use strstr() to get base name of the desktop file
+Patch0:         epiphany-application-mode-fix-desktopfile.patch
+
 BuildRequires:  fdupes
 BuildRequires:  meson
 BuildRequires:  pkgconfig
@@ -97,7 +100,7 @@ search results from Web (epiphany)
 %lang_package
 
 %prep
-%autosetup
+%autosetup -p1
 %if ! 0%{?is_opensuse}
 translation-update-upstream
 %endif