diff --git a/libaccounts-glib b/libaccounts-glib index 1c9746c..17201ad 160000 --- a/libaccounts-glib +++ b/libaccounts-glib @@ -1 +1 @@ -Subproject commit 1c9746c5a218cc22d98e21aef6e7d51cd3f68676 +Subproject commit 17201ad512e86d248ac158046ac322e7164adc87 diff --git a/rpm/0002-Fix-compilation-error.patch b/rpm/0002-Fix-compilation-error.patch deleted file mode 100644 index 0dd14c6..0000000 --- a/rpm/0002-Fix-compilation-error.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c892f8d1f54203dc34d98b3ae1aa5d8bde2f1048 Mon Sep 17 00:00:00 2001 -From: John Brooks -Date: Mon, 28 Oct 2013 05:48:42 -0600 -Subject: [PATCH 4/5] Fix compilation error - ---- - libaccounts-glib/ag-provider.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libaccounts-glib/ag-provider.c b/libaccounts-glib/ag-provider.c -index 90463ad..5322838 100644 ---- a/libaccounts-glib/ag-provider.c -+++ b/libaccounts-glib/ag-provider.c -@@ -441,7 +441,7 @@ ag_provider_get_plugin_name (AgProvider *provider) - gboolean - ag_provider_get_single_account (AgProvider *provider) - { -- g_return_val_if_fail (provider != NULL, NULL); -+ g_return_val_if_fail (provider != NULL, FALSE); - return provider->single_account; - } - --- -1.7.9.5 - diff --git a/rpm/0003-Remove-use-of-function-only-available-in-check-0.9.1.patch b/rpm/0002-Remove-use-of-function-only-available-in-check-0.9.1.patch similarity index 100% rename from rpm/0003-Remove-use-of-function-only-available-in-check-0.9.1.patch rename to rpm/0002-Remove-use-of-function-only-available-in-check-0.9.1.patch diff --git a/rpm/libaccounts-glib.changes b/rpm/libaccounts-glib.changes index 281f724..256c8b5 100644 --- a/rpm/libaccounts-glib.changes +++ b/rpm/libaccounts-glib.changes @@ -1,3 +1,6 @@ +* Mon Sept 08 2014 Philippe De Swert - 1.18 +- Update to upstream version 1.18 + * Fri Jul 25 2014 Slava Monich - 1.16 - Update to upstream version 1.16 diff --git a/rpm/libaccounts-glib.spec b/rpm/libaccounts-glib.spec index 3d064b6..2145ffd 100644 --- a/rpm/libaccounts-glib.spec +++ b/rpm/libaccounts-glib.spec @@ -1,5 +1,5 @@ Name: libaccounts-glib -Version: 1.14 +Version: 1.18 Release: 1 License: LGPLv2.1 Summary: Accounts base library @@ -7,8 +7,7 @@ URL: https://code.google.com/p/accounts-sso.libaccounts-glib/ Group: System/Libraries Source: %{name}-%{version}.tar.gz Patch0: 0001-Remove-gtk-doc-dependency-for-disable-gtk-doc.patch -Patch1: 0002-Fix-compilation-error.patch -Patch2: 0003-Remove-use-of-function-only-available-in-check-0.9.1.patch +Patch1: 0002-Remove-use-of-function-only-available-in-check-0.9.1.patch BuildRequires: pkgconfig(check) >= 0.9.4 BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) @@ -54,7 +53,6 @@ This package contains tests for %{name}. %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build export SERVICE_FILES_DIR=/usr/share/accounts/services