diff --git a/baselibs.conf b/baselibs.conf index 7edaffa..6441786 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ libgoa-1_0-0 -libgoa-backend-1_0-0 +libgoa-backend-1_0-1 diff --git a/gnome-online-accounts-3.9.5.tar.xz b/gnome-online-accounts-3.9.5.tar.xz deleted file mode 100644 index ca6836d..0000000 --- a/gnome-online-accounts-3.9.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83af838a45b8ffcc294b7cc40f6cf72772820a3efbb54634660c7b76007ee49c -size 668740 diff --git a/gnome-online-accounts-3.9.90.tar.xz b/gnome-online-accounts-3.9.90.tar.xz new file mode 100644 index 0000000..bcdbcf3 --- /dev/null +++ b/gnome-online-accounts-3.9.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8626991be388cd5610f1de73879b30704e0d1e6af957e257a045372281ed9913 +size 1257948 diff --git a/gnome-online-accounts-webkitgtk-2.1.90.patch b/gnome-online-accounts-webkitgtk-2.1.90.patch new file mode 100644 index 0000000..db96443 --- /dev/null +++ b/gnome-online-accounts-webkitgtk-2.1.90.patch @@ -0,0 +1,53 @@ +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 42e7471..210b77d 100644 --- a/gnome-online-accounts.changes +++ b/gnome-online-accounts.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sun Sep 1 17:08:03 UTC 2013 - zaitor@opensuse.org + +- Add gnome-online-accounts-webkitgtk-2.1.90.patch: Adapt to + webkitgtk 2.1.90 API. + +------------------------------------------------------------------- +Thu Aug 22 20:22:27 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.9.90: + + Support Telepathy accounts (bgo#696267). + + Bugs fixed: bgo#705366, bgo#706074. + + Updated translations. +- Add pkgconfig(telepathy-glib) BuildRequires: new dependency for + Telepathy account support. +- Add glib schema handling scriptlets to post/postun. +- Rename libgoa-backend-1_0-0 subpackage to libgoa-backend-1_0-1, + following upstreams soname bump. + ------------------------------------------------------------------- Tue Jul 30 16:26:26 UTC 2013 - dimstar@opensuse.org diff --git a/gnome-online-accounts.spec b/gnome-online-accounts.spec index 1c86145..306819d 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.5 +Version: 3.9.90 Release: 0 Summary: GNOME service to access online accounts License: LGPL-2.0+ @@ -27,6 +27,8 @@ 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 @@ -48,7 +50,8 @@ BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsoup-2.4) >= 2.41 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(rest-0.7) -BuildRequires: pkgconfig(webkitgtk-3.0) +BuildRequires: pkgconfig(telepathy-glib) +BuildRequires: pkgconfig(webkitgtk-3.0) >= 2.1.90 # p11-kit is not 'strictly' seen a requirement, but without it none of the SSL/TLS # Certificates are considered valid, which results in a really bad experience. Requires: p11-kit >= 0.16 @@ -79,12 +82,12 @@ libraries in GNOME can access the user's online accounts. This package provides the GObject Introspection bindings for the libgoa client library. -%package -n libgoa-backend-1_0-0 +%package -n libgoa-backend-1_0-1 Summary: GNOME service to access online accounts -- Backend Library Group: System/Libraries Recommends: %{name} -%description -n libgoa-backend-1_0-0 +%description -n libgoa-backend-1_0-1 gnome-online-accounts provides interfaces so applications and libraries in GNOME can access the user's online accounts. @@ -92,7 +95,7 @@ libraries in GNOME can access the user's online accounts. Summary: GNOME service to access online accounts -- Development Files Group: Development/Libraries/GNOME Requires: libgoa-1_0-0 = %{version} -Requires: libgoa-backend-1_0-0 = %{version} +Requires: libgoa-backend-1_0-1 = %{version} Requires: typelib-1_0-Goa-1_0 = %{version} %description devel @@ -103,6 +106,7 @@ libraries in GNOME can access the user's online accounts. %prep %setup -q translation-update-upstream +%patch0 -p1 %build %if 0%{?with_twitter} @@ -136,17 +140,24 @@ make %{?_smp_mflags} %make_install find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %find_lang %{name} %{?no_lang_C} +%find_lang gnome-online-accounts-tpaw %{name}.lang %{?no_lang_C} %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 -%post -n libgoa-backend-1_0-0 -p /sbin/ldconfig +%post -n libgoa-backend-1_0-1 -p /sbin/ldconfig -%postun -n libgoa-backend-1_0-0 -p /sbin/ldconfig +%postun -n libgoa-backend-1_0-1 -p /sbin/ldconfig %files %defattr(-,root,root) @@ -155,6 +166,8 @@ rm -rf %{buildroot} %{_datadir}/dbus-1/services/org.gnome.OnlineAccounts.service %{_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 @@ -165,7 +178,7 @@ rm -rf %{buildroot} %defattr(-,root,root) %{_libdir}/girepository-1.0/Goa-1.0.typelib -%files -n libgoa-backend-1_0-0 +%files -n libgoa-backend-1_0-1 %defattr(-,root,root) %{_libdir}/libgoa-backend-1.0.so.*