Accepting request 429071 from GNOME:Factory

New stable, resub, now building I hope (forwarded request 428622 from Zaitor)

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

epiphany-3.20.3.tar.xz

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

epiphany-3.22.0.tar.xz

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

epiphany-embed-Check-for-NULL-SoupURI.patch

@@ -1,39 +0,0 @@
-From 9573c6efe61fe91b055e66ee7928bfe0e2b3bc0a Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 30 Jun 2016 16:45:13 +0200
-Subject: embed: Check for NULL SoupURI when trying to load invalid url
-
-Fixes crashes when accessing soup_uri memory. If there is no valid
-uri, just set the "local page" security level.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=768250
----
- embed/ephy-web-view.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
-index 73166bc..40af96a 100644
---- a/embed/ephy-web-view.c
-+++ b/embed/ephy-web-view.c
-@@ -1427,7 +1427,7 @@ update_security_status_for_committed_load (EphyWebView *view,
-   g_clear_object (&view->certificate);
-   g_clear_pointer (&view->tls_error_failing_uri, g_free);
- 
--  if (webkit_security_manager_uri_scheme_is_local (security_manager, soup_uri->scheme)) {
-+  if (!soup_uri || webkit_security_manager_uri_scheme_is_local (security_manager, soup_uri->scheme)) {
-     security_level = EPHY_SECURITY_LEVEL_LOCAL_PAGE;
-   } else if (webkit_web_view_get_tls_info (WEBKIT_WEB_VIEW (view), &view->certificate, &view->tls_errors)) {
-     g_object_ref (view->certificate);
-@@ -1439,7 +1439,8 @@ update_security_status_for_committed_load (EphyWebView *view,
- 
-   ephy_web_view_set_security_level (view, security_level);
- 
--  soup_uri_free (soup_uri);
-+  if (soup_uri)
-+    soup_uri_free (soup_uri);
- }
- 
- static void
--- 
-cgit v0.12
-

epiphany.changes

@@ -1,3 +1,102 @@
+-------------------------------------------------------------------
+Mon Sep 19 07:57:38 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.22.0:
+  + Updated translations.
+- Bump base version to 3.22, we are now on the stable branch.
+
+-------------------------------------------------------------------
+Mon Sep 12 06:42:45 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.91:
+  + Add support for opening FTP URIs in an external application
+    (bgo#136501).
+  + Fix crash in non-English locales (bgo#765374).
+  + Don't crash if loading a local web app that uses an absolute
+    path (bgo#767101).
+  + Fix several features that were broken when multiple tabs share
+    a web process (bgo#769627).
+  + Remove keyboard shortcut for Duplicate Tab since it clashes
+    with GtkInspector.
+  + Remove assertion that was breaking error pages on certain
+    network errors.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Aug 16 09:56:52 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.90:
+  + Fix memory leaks (bgo#769228).
+  + Limit geolocation/notification permission request info bars
+    (bgo#764593).
+  + Fix mistake in tracking the remember password info bar.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Thu Jul 28 18:26:48 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.4:
+  + Check for NULL SoupURI when trying to load invalid url
+    (bgo#768250).
+  + Fix misleading ChangeLog generation code (bgo#768218).
+  + Limit side of ChangeLog file (bgo#768218).
+  + Add keyboard shortcuts dialog (bgo#757830).
+  + Update POTFILES.in (bgo#757830).
+  + Generate ChangeLog in builddir (bgo#768218).
+  + Updated translations.
+- Add conditional for translation-update-upstream BuildRequires and
+  it's macro: Only apply for non-openSUSE.
+- Drop epiphany-embed-Check-for-NULL-SoupURI.patch: Fixed upstream.
+
+-------------------------------------------------------------------
+Thu Jul 28 18:26:38 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.3:
+  + Require WebKitGTK+ 2.13.1.
+  + Allow toggling web inspector with keyboard shortcuts
+    (bgo#676870).
+  + Activate downloads popover only for active window (bgo#764303).
+  + Allow running system web apps outside GNOME (bgo#767101).
+  + Indicate when running in web app mode in user agent
+    (bgo#767123).
+  + Find web app names using OpenGraph site_name in name attribute
+    (bgo#767184).
+  + Support large standard HTML icons and SVG for web app icons
+    (bgo#767257).
+  + Increase default webapp icon size to 192 (bgo#767407).
+  + Middle-clicking the title bar doesn't send Epiphany to the
+    background (bgo#767585).
+  + Updated translations.
+- No longer package ChangeLog, it's now a empty file.
+
+-------------------------------------------------------------------
+Thu Jul 28 18:26:28 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.2:
+  + Removed NSS and libwnck dependencies.
+  + Cleanups in downloads code (bgo#610586).
+  + Improved reliability of displaying overview snapshots
+    (bgo#763184, bgo#765863).
+  + Incognito mode theme fixes.
+  + Updated translations.
+- Drop pkgconfig(nss) and pkgconfig(libwnck-3.0) BuildRequires:
+  Following upstream changes.
+- Stop passing V=1 to make, debugging is local.
+- Drop epiphany-extensions, epiphany-extensions-lang and
+  epiphany-devel Obsoletes, it was removed for the 3.8.0 release,
+  and we do not support upgrades from releases that old.
+
+-------------------------------------------------------------------
+Thu Jul 28 18:26:18 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.21.1:
+  + Add Paste and Go context menu item to address bar (bgo#319506).
+  + Redesigned error pages (bgo#744063).
+  + Add Duplicate Tab context menu item to tabs (bgo#763221).
+  + Switch to sane default bookmarks (bgo#763307).
+  + Add hidden settings to control tab expand and location
+    (bgo#764368).
+
 -------------------------------------------------------------------
 Thu Jul 28 18:26:08 UTC 2016 - zaitor@opensuse.org
 

epiphany.spec

@@ -17,24 +17,24 @@
 
 
 Name:           epiphany
-Version:        3.20.3
+Version:        3.22.0
 Release:        0
-%define _base_version 3.20
+%define _base_version 3.22
 Summary:        GNOME Web Browser
 License:        GPL-2.0+
 Group:          Productivity/Networking/Web/Browsers
 Url:            http://www.gnome.org/projects/epiphany/
-Source:         http://download.gnome.org/sources/epiphany/3.20/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/epiphany/3.22/%{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-embed-Check-for-NULL-SoupURI.patch bgo#768250 zaitor@opensuse.org -- Fixes crashes when accessing soup_uri memory.
-Patch1:         epiphany-embed-Check-for-NULL-SoupURI.patch
 # The icon we rely on is from adwaita-icon-theme
 BuildRequires:  adwaita-icon-theme
 BuildRequires:  fdupes
 BuildRequires:  gnome-icon-theme
 BuildRequires:  intltool >= 0.50
+%if ! 0%{?is_opensuse}
 BuildRequires:  translation-update-upstream
+%endif
 BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(avahi-client) >= 0.6.22
@@ -51,25 +51,18 @@ BuildRequires:  pkgconfig(iso-codes) >= 0.35
 BuildRequires:  pkgconfig(libnotify) >= 0.5.1
 BuildRequires:  pkgconfig(libsecret-1) >= 0.14
 BuildRequires:  pkgconfig(libsoup-2.4) >= 2.42.1
-BuildRequires:  pkgconfig(libwnck-3.0)
 BuildRequires:  pkgconfig(libxml-2.0) >= 2.6.12
 BuildRequires:  pkgconfig(libxslt) >= 1.1.7
-BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.11.4
+BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.13.2
-BuildRequires:  pkgconfig(webkit2gtk-web-extension-4.0) >= 2.11.1
+BuildRequires:  pkgconfig(webkit2gtk-web-extension-4.0) >= 2.13.2
 BuildRequires:  pkgconfig(x11)
 Requires:       %{name}-branding = %{version}
 Requires:       NetworkManager
 Requires:       iso-codes
 Recommends:     %{name}-lang
 Recommends:     ca-certificates
-# Epiphany dropped extensions support in 3.7.1; thus obsoleting the extensions package.
-Obsoletes:      epiphany-extensions < %{version}
-Obsoletes:      epiphany-extensions-lang < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# With epiphany 3.7.90, the installation of headers and API doc was stopped. Obsolete an eventual installed package.
-Obsoletes:      %{name}-devel < 3.7.90
 %glib2_gsettings_schema_requires
 
 %description
@@ -102,7 +95,7 @@ This package provides the upstream default bookmarks and user agent
 string.
 
 %package -n gnome-shell-search-provider-epiphany
-Summary:        Epiphany is a Web browser for the GNOME Desktop -- Search Provider for GNOME Shell
+Summary:        Epiphany Search Provider for GNOME Shell
 Group:          Productivity/Networking/Web/Browsers
 Requires:       %{name} = %{version}
 Requires:       gnome-shell
@@ -117,15 +110,16 @@ search results from Web (epiphany)
 %lang_package
 %prep
 %setup -q
+%if ! 0%{?is_opensuse}
 translation-update-upstream
+%endif
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure \
     --disable-maintainer-mode \
     --with-distributor-name="SUSE"
-make %{?_smp_mflags} V=1
+make %{?_smp_mflags}
 
 %install
 %make_install
@@ -155,7 +149,7 @@ done
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING NEWS README TODO
 %doc %{_datadir}/help/C/%{name}/
 %{_bindir}/ephy-profile-migrator
 %{_bindir}/epiphany