- added update patch (adjust for libsignon-glib 2.x API); release 4

diff --git a/credentials-control-center-update.patch b/credentials-control-center-update.patch
new file mode 100644 (file)
index 0000000..fb769d3
--- /dev/null
+++ b/credentials-control-center-update.patch
@@ -0,0 +1,74 @@
+--- credentials-control-center-0.1.5/libaccount-plugin/oauth-plugin.c.orig     2013-03-25 09:57:42.000000000 +0100
++++ credentials-control-center-0.1.5/libaccount-plugin/oauth-plugin.c  2019-04-22 20:56:50.912695351 +0200
+@@ -41,6 +41,7 @@
+ #include <libsignon-glib/signon-auth-session.h>
+ #include <libsignon-glib/signon-errors.h>
+ #include <libsignon-glib/signon-identity.h>
++#include <libsignon-glib/signon-security-context.h>
+ 
+ enum
+ {
+@@ -184,7 +185,7 @@
+         !priv->deleting_identity)
+     {
+         priv->deleting_identity = TRUE;
+-        signon_identity_remove (priv->identity, identity_removed_cb, self);
++        signon_identity_remove (priv->identity, NULL, identity_removed_cb, self);
+     }
+ 
+     finish_if_ready (self);
+@@ -342,7 +343,7 @@
+ {
+     ApOAuthPluginPrivate *priv = self->priv;
+ 
+-    signon_identity_query_info (priv->identity, query_info_cb, self);
++    signon_identity_query_info (priv->identity, NULL, query_info_cb, self);
+ }
+ 
+ static void
+@@ -504,7 +505,7 @@
+         return;
+     }
+     priv->authenticating = TRUE;
+-    signon_auth_session_process_async (priv->auth_session, session_data,
++    signon_auth_session_process (priv->auth_session, session_data,
+                                        get_mechanism (priv),
+                                        priv->cancellable,
+                                        auth_session_process_cb,
+@@ -550,10 +551,11 @@
+ {
+     SignonIdentityInfo *info;
+     AgProvider *provider;
+-    const gchar *acl_all[] = { "*", NULL };
+     const gchar *username;
+     const gchar *secret;
++    GList *acl_list = NULL;
+ 
++    acl_list = g_list_append (acl_list, signon_security_context_new_from_values ("*", NULL));
+     username = ap_plugin_get_username ((ApPlugin *)self);
+     secret = ap_plugin_get_password ((ApPlugin *)self);
+     if (secret == NULL) secret = "";
+@@ -566,10 +568,11 @@
+     if (username != NULL)
+         signon_identity_info_set_username (info, username);
+     signon_identity_info_set_secret (info, secret, TRUE);
+-    signon_identity_info_set_access_control_list (info, acl_all);
++    signon_identity_info_set_access_control_list (info, acl_list);
++    g_list_free_full (acl_list, (GDestroyNotify)signon_security_context_free);
+ 
+     self->priv->identity = signon_identity_new ();
+-    signon_identity_store_credentials_with_info (self->priv->identity, info,
++    signon_identity_store_info (self->priv->identity, info, NULL,
+                                                  identity_store_cb, self);
+     signon_identity_info_free (info);
+ }
+--- credentials-control-center-0.1.5/libaccount-plugin/plugin.c.orig   2013-03-25 09:57:42.000000000 +0100
++++ credentials-control-center-0.1.5/libaccount-plugin/plugin.c        2019-04-22 21:17:13.259406664 +0200
+@@ -285,6 +285,7 @@
+         if (identity != NULL) {
+             deleting_identity = TRUE;
+             signon_identity_remove (identity,
++                                    NULL,
+                                     identity_removed_cb,
+                                     result);
+         }

diff --git a/credentials-control-center.spec b/credentials-control-center.spec
index c00a68b33b2f8a0e4d684e313b6ad95c7cc8253a..4cb2cd8ac864c33ca5b893972c396496d820ad17 100644 (file)
--- a/credentials-control-center.spec
+++ b/credentials-control-center.spec
@@ -7,12 +7,13 @@ Summary:      Ubuntu Online Accounts configuration panel
 Summary(pl.UTF-8):     Panel konfiguracyjny Ubuntu Online Accounts
 Name:          credentials-control-center
 Version:       0.1.5
-Release:       3
+Release:       4
 License:       LGPL v3 (libaccount-plugin), GPL v3 (panel)
 Group:         Libraries
 #Source0Download: https://launchpad.net/gnome-control-center-signon/
 Source0:       https://launchpad.net/gnome-control-center-signon/13.04/%{version}/+download/%{name}-%{version}.tar.xz
 # Source0-md5: deaa290c89dffee5198f3f0f6f2e1fe1
+Patch0:                %{name}-update.patch
 URL:           https://launchpad.net/gnome-control-center-signon/
 BuildRequires: glib2-devel >= 1:2.30
 %{?with_gnome_cc:BuildRequires:        gnome-control-center-devel}
@@ -73,6 +74,10 @@ Requires:    libsignon-glib >= 1.8
 libaccount-plugin is an auxiliary library which provides support for
 account plugins.
 
+%description -n libaccount-plugin -l pl.UTF-8
+libaccount-plugin to biblioteka pomocnicza zapewniająca obsługę
+wtyczek dla kont.
+
 %package -n libaccount-plugin-devel
 Summary:       Development files for account-plugin library
 Summary(pl.UTF-8):     Pliki programistyczne biblioteki account-plugin
@@ -133,6 +138,7 @@ API języka Vala do biblioteki libaccount-plugin.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \