[packages/gnome-packagekit] - updated to 3.24.0 - updated systemd-fallback patch
qboosh
qboosh at pld-linux.org
Fri Jun 2 21:42:34 CEST 2017
commit 236f18ea73d9c5aaa0bde379a8498d091cbeedb4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jun 2 21:43:36 2017 +0200
- updated to 3.24.0
- updated systemd-fallback patch
gnome-packagekit.spec | 20 ++++++++---------
systemd-fallback.patch | 58 +++++++++++++++++++++++---------------------------
2 files changed, 37 insertions(+), 41 deletions(-)
---
diff --git a/gnome-packagekit.spec b/gnome-packagekit.spec
index 4120202..5d5ea6b 100644
--- a/gnome-packagekit.spec
+++ b/gnome-packagekit.spec
@@ -5,15 +5,15 @@
Summary: GNOME PackageKit Client
Summary(pl.UTF-8): Klient PackageKit dla GNOME
Name: gnome-packagekit
-Version: 3.18.0
+Version: 3.24.0
Release: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-packagekit/3.18/%{name}-%{version}.tar.xz
-# Source0-md5: e24d383b4bcaeb642b0082600ae417b0
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-packagekit/3.24/%{name}-%{version}.tar.xz
+# Source0-md5: fb460341360b91977eeba35c8e38d3ba
Patch0: systemd-fallback.patch
URL: http://www.packagekit.org/
-BuildRequires: PackageKit-devel >= 0.8.0
+BuildRequires: PackageKit-devel >= 0.9.1
BuildRequires: appstream-glib-devel
BuildRequires: autoconf >= 2.65
BuildRequires: automake >= 1.11
@@ -22,7 +22,7 @@ BuildRequires: dbus-glib-devel >= 0.74
BuildRequires: docbook-dtd41-sgml
BuildRequires: docbook-utils
BuildRequires: fontconfig-devel
-BuildRequires: gettext-tools
+BuildRequires: gettext-tools >= 0.19.7
BuildRequires: glib2-devel >= 1:2.32.0
BuildRequires: gnome-common
BuildRequires: gtk+3-devel >= 3.15.3
@@ -46,7 +46,7 @@ Requires(post,postun): desktop-file-utils
Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): hicolor-icon-theme
Requires(post,preun): glib2 >= 1:2.32.0
-Requires: PackageKit >= 0.8.0
+Requires: PackageKit >= 0.9.1
Requires: glib2 >= 1:2.32.0
Requires: gtk+3 >= 3.15.3
Requires: polkit-gnome >= 0.92
@@ -109,10 +109,10 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/gpk-prefs
%attr(755,root,root) %{_bindir}/gpk-update-viewer
%{_datadir}/GConf/gsettings/org.gnome.packagekit.gschema.migrate
-%{_datadir}/appdata/gpk-application.appdata.xml
-%{_datadir}/appdata/gpk-update-viewer.appdata.xml
%{_datadir}/glib-2.0/schemas/org.gnome.packagekit.gschema.xml
%{_datadir}/gnome-packagekit
+%{_datadir}/metainfo/org.gnome.PackageUpdater.appdata.xml
+%{_datadir}/metainfo/org.gnome.Packages.appdata.xml
%{_iconsdir}/hicolor/*x*/apps/gpk-*.png
# terminating "*" is a workaround for rpm glob failing to glob dirs with symlinks dead at build time
%{_iconsdir}/hicolor/*x*/mimetypes/application-x-catalog.png*
@@ -120,11 +120,11 @@ rm -rf $RPM_BUILD_ROOT
%{_iconsdir}/hicolor/scalable/apps/gpk-*.svg
%{_iconsdir}/hicolor/scalable/mimetypes/application-x-catalog.svg
%{_iconsdir}/hicolor/scalable/mimetypes/application-x-package-list.svg
-%{_desktopdir}/gpk-application.desktop
%{_desktopdir}/gpk-install-local-file.desktop
%{_desktopdir}/gpk-log.desktop
%{_desktopdir}/gpk-prefs.desktop
-%{_desktopdir}/gpk-update-viewer.desktop
+%{_desktopdir}/org.gnome.PackageUpdater.desktop
+%{_desktopdir}/org.gnome.Packages.desktop
%{_mandir}/man1/gpk-application.1*
%{_mandir}/man1/gpk-log.1*
%{_mandir}/man1/gpk-prefs.1*
diff --git a/systemd-fallback.patch b/systemd-fallback.patch
index 4d3c21e..8eaaca9 100644
--- a/systemd-fallback.patch
+++ b/systemd-fallback.patch
@@ -1,32 +1,30 @@
-diff -urN gnome-packagekit-3.6.0/configure.ac gnome-packagekit-3.6.0.new/configure.ac
---- gnome-packagekit-3.6.0/configure.ac 2012-09-25 16:19:50.000000000 +0200
-+++ gnome-packagekit-3.6.0.new/configure.ac 2012-10-09 13:56:53.458180536 +0200
-@@ -146,7 +146,7 @@
+--- gnome-packagekit-3.24.0/configure.ac.orig 2017-06-02 20:22:27.252302717 +0200
++++ gnome-packagekit-3.24.0/configure.ac 2017-06-02 20:45:14.838953769 +0200
+@@ -129,7 +129,7 @@
[with_systemd=auto])
PKG_CHECK_MODULES(SYSTEMD,
-- [libsystemd-login polkit-gobject-1],
-+ [libsystemd-daemon libsystemd-login polkit-gobject-1 dbus-glib-1],
+- [libsystemd polkit-gobject-1],
++ [libsystemd polkit-gobject-1 dbus-glib-1],
[have_systemd=yes], [have_systemd=no])
AC_MSG_CHECKING([whether to use systemd])
-diff -urN gnome-packagekit-3.6.0/src/Makefile.am gnome-packagekit-3.6.0.new/src/Makefile.am
---- gnome-packagekit-3.6.0/src/Makefile.am 2012-05-15 14:44:47.000000000 +0200
-+++ gnome-packagekit-3.6.0.new/src/Makefile.am 2012-10-09 13:59:32.313986610 +0200
-@@ -87,6 +87,8 @@
+--- gnome-packagekit-3.24.0/src/Makefile.am.orig 2017-06-02 20:45:59.025619930 +0200
++++ gnome-packagekit-3.24.0/src/Makefile.am 2017-06-02 20:51:32.112282791 +0200
+@@ -42,6 +42,8 @@
+ gpk-common.h \
+ gpk-task.c \
gpk-task.h \
- gpk-error.c \
- gpk-error.h \
+ egg-console-kit.c \
+ egg-console-kit.h \
- $(NULL)
+ gpk-error.c \
+ gpk-error.h
+
+--- gnome-packagekit-3.24.0/src/gpk-update-viewer.c.orig 2016-12-06 20:33:18.000000000 +0100
++++ gnome-packagekit-3.24.0/src/gpk-update-viewer.c 2017-06-02 20:53:20.828948216 +0200
+@@ -30,8 +30,10 @@
+ #include <packagekit-glib2/packagekit.h>
- if WITH_SYSTEMD
---- gnome-packagekit-3.18.0/src/gpk-update-viewer.c.orig 2015-08-19 14:49:32.000000000 +0200
-+++ gnome-packagekit-3.18.0/src/gpk-update-viewer.c 2015-11-15 10:25:06.034263689 +0100
-@@ -32,8 +32,10 @@
- #include "egg-string.h"
- #include "egg-markdown.h"
#ifdef HAVE_SYSTEMD
+#include <systemd/sd-daemon.h>
#include "systemd-proxy.h"
@@ -35,15 +33,15 @@ diff -urN gnome-packagekit-3.6.0/src/Makefile.am gnome-packagekit-3.6.0.new/src/
#include "gpk-cell-renderer-info.h"
#include "gpk-cell-renderer-restart.h"
-@@ -58,6 +60,7 @@
+@@ -56,6 +58,7 @@ static PkRestartEnum restart_worst = 0
#ifdef HAVE_SYSTEMD
static SystemdProxy *proxy = NULL;
#endif
+static EggConsoleKit *console = NULL;
- static EggMarkdown *markdown = NULL;
static GCancellable *cancellable = NULL;
static GSettings *settings = NULL;
-@@ -242,10 +245,11 @@
+ static GPtrArray *update_array = NULL;
+@@ -225,10 +228,11 @@ gpk_update_viewer_check_restart (void)
if (restart_update == PK_RESTART_ENUM_SYSTEM ||
restart_update == PK_RESTART_ENUM_SECURITY_SYSTEM) {
#ifdef HAVE_SYSTEMD
@@ -58,13 +56,12 @@ diff -urN gnome-packagekit-3.6.0/src/Makefile.am gnome-packagekit-3.6.0.new/src/
}
/* only show the button if we can do the action */
-@@ -266,13 +270,18 @@
+@@ -249,12 +253,17 @@ gpk_update_viewer_check_restart (void)
/* do the action */
if (restart_update == PK_RESTART_ENUM_SYSTEM) {
#ifdef HAVE_SYSTEMD
-- ret = systemd_proxy_restart (proxy, &error);
+ if (proxy != NULL)
-+ ret = systemd_proxy_restart (proxy, &error);
+ ret = systemd_proxy_restart (proxy, &error);
+ else
+#endif
+ /* use consolekit to restart */
@@ -73,13 +70,12 @@ diff -urN gnome-packagekit-3.6.0/src/Makefile.am gnome-packagekit-3.6.0.new/src/
if (!ret) {
/* TRANSLATORS: the PackageKit request did not complete, and it did not send an error */
gpk_update_viewer_error_dialog (_("Could not restart"), NULL, error->message);
- g_error_free (error);
}
-#endif
}
- out:
return ret;
-@@ -3207,8 +3216,12 @@
+ }
+@@ -2753,8 +2762,12 @@ gpk_update_viewer_application_startup_cb
settings = g_settings_new (GPK_SETTINGS_SCHEMA);
#ifdef HAVE_SYSTEMD
@@ -91,9 +87,9 @@ diff -urN gnome-packagekit-3.6.0/src/Makefile.am gnome-packagekit-3.6.0.new/src/
+ console = egg_console_kit_new ();
+
cancellable = g_cancellable_new ();
- markdown = egg_markdown_new ();
- egg_markdown_set_output (markdown, EGG_MARKDOWN_OUTPUT_PANGO);
-@@ -3450,6 +3463,8 @@
+
+ control = pk_control_new ();
+@@ -2980,6 +2993,8 @@ main (int argc, char *argv[])
if (proxy != NULL)
systemd_proxy_free (proxy);
#endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-packagekit.git/commitdiff/236f18ea73d9c5aaa0bde379a8498d091cbeedb4
More information about the pld-cvs-commit
mailing list