From 8bef4a9ba734c5041f054cb321c97638e7e974f70e55942adb5b447cc0a5568b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 7 Sep 2013 13:21:59 +0000 Subject: [PATCH] Accepting request 197075 from home:dimstar:branches:GNOME:Factory Update to 3.9.91 OBS-URL: https://build.opensuse.org/request/show/197075 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-online-accounts?expand=0&rev=58 --- gnome-online-accounts-3.9.90.tar.xz | 3 -- gnome-online-accounts-3.9.91.tar.xz | 3 ++ gnome-online-accounts-webkitgtk-2.1.90.patch | 53 -------------------- gnome-online-accounts.changes | 12 +++++ gnome-online-accounts.spec | 12 +---- 5 files changed, 16 insertions(+), 67 deletions(-) delete mode 100644 gnome-online-accounts-3.9.90.tar.xz create mode 100644 gnome-online-accounts-3.9.91.tar.xz delete mode 100644 gnome-online-accounts-webkitgtk-2.1.90.patch diff --git a/gnome-online-accounts-3.9.90.tar.xz b/gnome-online-accounts-3.9.90.tar.xz deleted file mode 100644 index bcdbcf3..0000000 --- a/gnome-online-accounts-3.9.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8626991be388cd5610f1de73879b30704e0d1e6af957e257a045372281ed9913 -size 1257948 diff --git a/gnome-online-accounts-3.9.91.tar.xz b/gnome-online-accounts-3.9.91.tar.xz new file mode 100644 index 0000000..c125756 --- /dev/null +++ b/gnome-online-accounts-3.9.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a41cf600ea8dd05bce432e2c58ed931b720af3053bbba480180ed77a0ce7f33d +size 1260444 diff --git a/gnome-online-accounts-webkitgtk-2.1.90.patch b/gnome-online-accounts-webkitgtk-2.1.90.patch deleted file mode 100644 index db96443..0000000 --- a/gnome-online-accounts-webkitgtk-2.1.90.patch +++ /dev/null @@ -1,53 +0,0 @@ -From f5119db95aab7e97a30aca646833bcd72d4ba51f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Se=C3=A1n=20de=20B=C3=BArca?= -Date: Wed, 28 Aug 2013 11:02:30 -0600 -Subject: [PATCH] Update to new webkitgtk-2.1.90 API - -Fixes: https://bugzilla.gnome.org/707006 ---- - configure.ac | 2 +- - src/goabackend/goaflickrprovider.c | 4 ++-- - src/goabackend/goagoogleprovider.c | 6 +++--- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/goabackend/goaflickrprovider.c b/src/goabackend/goaflickrprovider.c -index 66396ba..7505482 100644 ---- a/src/goabackend/goaflickrprovider.c -+++ b/src/goabackend/goaflickrprovider.c -@@ -285,8 +285,8 @@ is_deny_node (GoaOAuthProvider *provider, WebKitDOMNode *node) - if (!WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (node)) - goto out; - -- element = WEBKIT_DOM_HTML_ELEMENT (node); -- id = webkit_dom_html_element_get_id (element); -+ element = WEBKIT_DOM_ELEMENT (node); -+ id = webkit_dom_element_get_id (element); - if (g_strcmp0 (id, "auth-disallow") != 0) - goto out; - -diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c -index ef28cf6..cee9d96 100644 ---- a/src/goabackend/goagoogleprovider.c -+++ b/src/goabackend/goagoogleprovider.c -@@ -270,8 +270,8 @@ is_deny_node (GoaOAuth2Provider *provider, WebKitDOMNode *node) - if (!WEBKIT_DOM_IS_HTML_BUTTON_ELEMENT (node)) - goto out; - -- element = WEBKIT_DOM_HTML_ELEMENT (node); -- id = webkit_dom_html_element_get_id (element); -+ element = WEBKIT_DOM_ELEMENT (node); -+ id = webkit_dom_element_get_id (element); - if (g_strcmp0 (id, "submit_deny_access") != 0) - goto out; - -@@ -300,7 +300,7 @@ is_identity_node (GoaOAuth2Provider *provider, WebKitDOMHTMLInputElement *elemen - if (g_strcmp0 (element_type, "email") != 0) - goto out; - -- id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (element)); -+ id = webkit_dom_element_get_id (WEBKIT_DOM_ELEMENT (element)); - if (g_strcmp0 (id, "Email") != 0) - goto out; - --- -1.8.3.1 diff --git a/gnome-online-accounts.changes b/gnome-online-accounts.changes index 210b77d..1198174 100644 --- a/gnome-online-accounts.changes +++ b/gnome-online-accounts.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Sep 2 11:11:54 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.9.91: + + Bugs fixed: bgo#699491, bgo#705395, bgo#706614, bgo#706664, + bgo#706803, bgo#706894, bgo#706987, bgo#707005, bgo#707006. + + Updated translations. +- Drop gnome-online-accounts-webkitgtk-2.1.90.patch: fixed + upstream. +- Remove gsettings schema calls from post/postun: upstream ships + this file now with empathy instead of gnome-online-accounts. + ------------------------------------------------------------------- Sun Sep 1 17:08:03 UTC 2013 - zaitor@opensuse.org diff --git a/gnome-online-accounts.spec b/gnome-online-accounts.spec index 306819d..fd9ec9a 100644 --- a/gnome-online-accounts.spec +++ b/gnome-online-accounts.spec @@ -19,7 +19,7 @@ %define with_twitter 0 Name: gnome-online-accounts -Version: 3.9.90 +Version: 3.9.91 Release: 0 Summary: GNOME service to access online accounts License: LGPL-2.0+ @@ -27,8 +27,6 @@ Group: System/GUI/GNOME Url: http://www.gnome.org Source: http://download.gnome.org/sources/gnome-online-accounts/3.9/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM gnome-online-accounts-webkitgtk-2.1.90.patch bgo#707006 zaitor@opensuse.org -- Adapt to webkitgtk 2.1.90 API, taken from git. -Patch0: gnome-online-accounts-webkitgtk-2.1.90.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc @@ -106,7 +104,6 @@ libraries in GNOME can access the user's online accounts. %prep %setup -q translation-update-upstream -%patch0 -p1 %build %if 0%{?with_twitter} @@ -145,12 +142,6 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %clean rm -rf %{buildroot} -%post -%glib2_gsettings_schema_post - -%postun -%glib2_gsettings_schema_postun - %post -n libgoa-1_0-0 -p /sbin/ldconfig %postun -n libgoa-1_0-0 -p /sbin/ldconfig @@ -167,7 +158,6 @@ rm -rf %{buildroot} %{_datadir}/gnome-online-accounts/ %{_datadir}/icons/hicolor/*/apps/goa-account*.png %{_datadir}/icons/hicolor/*/apps/im-*.* -%{_datadir}/glib-2.0/schemas/org.gnome.telepathy-account-widgets.gschema.xml %{_mandir}/man8/goa-daemon.8%{?ext_man} %files -n libgoa-1_0-0