From 9ba4d775edf368cca1fa9cf8662ac1d2b92a59f3 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Fri, 23 May 2014 18:30:14 +0200 Subject: [PATCH] Update to upstream 0.15.1 release --- ...lient_set_interactive-rather-than-th.patch | 42 ------------------- realmd.spec | 12 +++--- sources | 2 +- 3 files changed, 7 insertions(+), 49 deletions(-) delete mode 100644 0001-service-Use-pk_client_set_interactive-rather-than-th.patch diff --git a/0001-service-Use-pk_client_set_interactive-rather-than-th.patch b/0001-service-Use-pk_client_set_interactive-rather-than-th.patch deleted file mode 100644 index b0623bb..0000000 --- a/0001-service-Use-pk_client_set_interactive-rather-than-th.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6fbc9b1151448f2571eeb52dff0f955f04fe7a0b Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Thu, 30 Jan 2014 12:59:57 +0000 -Subject: [PATCH] service: Use pk_client_set_interactive() rather than the - deprecated PkTask function - -The pk_task_set_interactive() function has been removed in PackageKit 0.9.x and -it's fine to call the subclass version on any version of PackageKit. ---- - service/realm-packages.c | 2 +- - tests/frob-install-packages.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/service/realm-packages.c b/service/realm-packages.c -index ee61ee2..f9b0877 100644 ---- a/service/realm-packages.c -+++ b/service/realm-packages.c -@@ -382,7 +382,7 @@ realm_packages_install_async (const gchar **package_sets, - install = g_new0 (InstallClosure, 1); - install->task = pk_task_new (); - install->automatic = realm_options_automatic_install (options); -- pk_task_set_interactive (install->task, FALSE); -+ pk_client_set_interactive (PK_CLIENT (install->task), FALSE); - pk_client_set_background (PK_CLIENT (install->task), FALSE); - install->invocation = invocation ? g_object_ref (invocation) : NULL; - g_task_set_task_data (task, install, install_closure_free); -diff --git a/tests/frob-install-packages.c b/tests/frob-install-packages.c -index 8116a6e..61556ec 100644 ---- a/tests/frob-install-packages.c -+++ b/tests/frob-install-packages.c -@@ -121,7 +121,7 @@ test_resolve (void) - gint i; - - task = pk_task_new (); -- pk_task_set_interactive (task, FALSE); -+ pk_client_set_interactive (PK_CLIENT (task), FALSE); - - filter = pk_filter_bitfield_from_string ("arch"); - --- -1.8.5.3 - diff --git a/realmd.spec b/realmd.spec index 1dfbbd0..da31fba 100644 --- a/realmd.spec +++ b/realmd.spec @@ -1,14 +1,11 @@ Name: realmd -Version: 0.15.0 -Release: 2%{?dist} +Version: 0.15.1 +Release: 1%{?dist} Summary: Kerberos realm enrollment service License: LGPLv2+ URL: http://cgit.freedesktop.org/realmd/realmd/ Source0: http://www.freedesktop.org/software/realmd/releases/realmd-%{version}.tar.gz -# already sent upstream -Patch0: 0001-service-Use-pk_client_set_interactive-rather-than-th.patch - BuildRequires: intltool pkgconfig BuildRequires: gettext-devel BuildRequires: glib2-devel >= 2.32.0 @@ -38,7 +35,6 @@ applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .packagekit-api-change %build %configure --disable-silent-rules @@ -73,6 +69,10 @@ make install DESTDIR=%{buildroot} %doc %{_datadir}/doc/realmd/ %changelog +* Fri May 23 2014 Stef Walter - 0.15.1-1 +- Update to upstream 0.15.1 +- Remove the packagekit patch that's now integrated upstream + * Thu Jan 30 2014 Richard Hughes - 0.15.0-2 - Rebuild for libpackagekit-glib soname bump diff --git a/sources b/sources index 02b9877..9087532 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -570b27e37f05dd0de1611fdad9a7cfab realmd-0.15.0.tar.gz +268e77112d509208ecf12a4fe4bdeb47 realmd-0.15.1.tar.gz