[packages/gnome-packagekit] - updated to 3.18.0 - updated systemd-fallback patch
qboosh
qboosh at pld-linux.org
Sun Nov 15 11:40:25 CET 2015
commit 021fb65cc6f6d353cbfd3b0cb664c177583f472d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Nov 15 11:40:49 2015 +0100
- updated to 3.18.0
- updated systemd-fallback patch
gnome-packagekit.spec | 34 ++++++++++++++++++----------------
systemd-fallback.patch | 28 ++++++++++++++--------------
2 files changed, 32 insertions(+), 30 deletions(-)
---
diff --git a/gnome-packagekit.spec b/gnome-packagekit.spec
index 2508ba3..4120202 100644
--- a/gnome-packagekit.spec
+++ b/gnome-packagekit.spec
@@ -1,19 +1,20 @@
#
# Conditional build:
-%bcond_without systemd # rely on systemd for session tracking instead of ConsoleKit
+%bcond_without systemd # rely on systemd for session tracking instead of ConsoleKit
#
Summary: GNOME PackageKit Client
Summary(pl.UTF-8): Klient PackageKit dla GNOME
Name: gnome-packagekit
-Version: 3.14.2
+Version: 3.18.0
Release: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-packagekit/3.14/%{name}-%{version}.tar.xz
-# Source0-md5: a503defd4d21203407e2f2c6d92928b4
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-packagekit/3.18/%{name}-%{version}.tar.xz
+# Source0-md5: e24d383b4bcaeb642b0082600ae417b0
Patch0: systemd-fallback.patch
URL: http://www.packagekit.org/
BuildRequires: PackageKit-devel >= 0.8.0
+BuildRequires: appstream-glib-devel
BuildRequires: autoconf >= 2.65
BuildRequires: automake >= 1.11
BuildRequires: dbus-devel >= 1.2.0
@@ -24,14 +25,13 @@ BuildRequires: fontconfig-devel
BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:2.32.0
BuildRequires: gnome-common
-BuildRequires: gnome-doc-utils
-BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: gtk+3-devel >= 3.15.3
BuildRequires: gtk-doc >= 1.9
BuildRequires: intltool >= 0.35.0
BuildRequires: libcanberra-devel >= 0.10
BuildRequires: libcanberra-gtk3-devel >= 0.10
BuildRequires: libnotify-devel >= 0.7.0
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
BuildRequires: libxslt-progs
BuildRequires: pkgconfig
BuildRequires: polkit-devel
@@ -45,8 +45,10 @@ BuildRequires: yelp-tools
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.26.0
+Requires(post,preun): glib2 >= 1:2.32.0
Requires: PackageKit >= 0.8.0
+Requires: glib2 >= 1:2.32.0
+Requires: gtk+3 >= 3.15.3
Requires: polkit-gnome >= 0.92
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -103,27 +105,27 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog COPYING NEWS README
%attr(755,root,root) %{_bindir}/gpk-application
-%attr(755,root,root) %{_bindir}/gpk-dbus-service
-%attr(755,root,root) %{_bindir}/gpk-install-local-file
%attr(755,root,root) %{_bindir}/gpk-log
%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}/GConf/gsettings/org.gnome.packagekit.gschema.migrate
-%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
%{_datadir}/glib-2.0/schemas/org.gnome.packagekit.gschema.xml
%{_datadir}/gnome-packagekit
-%{_iconsdir}/hicolor/*/*/*
+%{_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*
+%{_iconsdir}/hicolor/*x*/mimetypes/application-x-package-list.png*
+%{_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-dbus-service.desktop
%{_desktopdir}/gpk-install-local-file.desktop
%{_desktopdir}/gpk-log.desktop
%{_desktopdir}/gpk-prefs.desktop
%{_desktopdir}/gpk-update-viewer.desktop
%{_mandir}/man1/gpk-application.1*
-%{_mandir}/man1/gpk-dbus-service.1*
-%{_mandir}/man1/gpk-install-local-file.1*
%{_mandir}/man1/gpk-log.1*
%{_mandir}/man1/gpk-prefs.1*
%{_mandir}/man1/gpk-update-viewer.1*
diff --git a/systemd-fallback.patch b/systemd-fallback.patch
index 3c53d3b..4d3c21e 100644
--- a/systemd-fallback.patch
+++ b/systemd-fallback.patch
@@ -6,7 +6,7 @@ diff -urN gnome-packagekit-3.6.0/configure.ac gnome-packagekit-3.6.0.new/configu
PKG_CHECK_MODULES(SYSTEMD,
- [libsystemd-login polkit-gobject-1],
-+ [libsystemd-daemon libsystemd-login polkit-gobject-1],
++ [libsystemd-daemon libsystemd-login polkit-gobject-1 dbus-glib-1],
[have_systemd=yes], [have_systemd=no])
AC_MSG_CHECKING([whether to use systemd])
@@ -22,9 +22,9 @@ diff -urN gnome-packagekit-3.6.0/src/Makefile.am gnome-packagekit-3.6.0.new/src/
$(NULL)
if WITH_SYSTEMD
---- gnome-packagekit-3.14.2/src/gpk-update-viewer.c.orig 2014-10-07 09:53:09.000000000 +0200
-+++ gnome-packagekit-3.14.2/src/gpk-update-viewer.c 2015-03-22 21:50:12.853724854 +0100
-@@ -33,8 +33,10 @@
+--- 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
@@ -35,7 +35,7 @@ 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"
-@@ -61,6 +63,7 @@
+@@ -58,6 +60,7 @@
#ifdef HAVE_SYSTEMD
static SystemdProxy *proxy = NULL;
#endif
@@ -43,7 +43,7 @@ diff -urN gnome-packagekit-3.6.0/src/Makefile.am gnome-packagekit-3.6.0.new/src/
static EggMarkdown *markdown = NULL;
static GCancellable *cancellable = NULL;
static GSettings *settings = NULL;
-@@ -245,10 +248,11 @@
+@@ -242,10 +245,11 @@
if (restart_update == PK_RESTART_ENUM_SYSTEM ||
restart_update == PK_RESTART_ENUM_SECURITY_SYSTEM) {
#ifdef HAVE_SYSTEMD
@@ -58,14 +58,14 @@ 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 */
-@@ -269,13 +274,18 @@
+@@ -266,13 +270,18 @@
/* 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);
-+ else
++ ret = systemd_proxy_restart (proxy, &error);
++ else
+#endif
+ /* use consolekit to restart */
+ ret = egg_console_kit_restart (console, &error);
@@ -76,10 +76,10 @@ diff -urN gnome-packagekit-3.6.0/src/Makefile.am gnome-packagekit-3.6.0.new/src/
g_error_free (error);
}
-#endif
- } else if (restart_update == PK_RESTART_ENUM_SESSION) {
- GpkSession *session;
- session = gpk_session_new ();
-@@ -3215,8 +3225,12 @@
+ }
+ out:
+ return ret;
+@@ -3207,8 +3216,12 @@
settings = g_settings_new (GPK_SETTINGS_SCHEMA);
#ifdef HAVE_SYSTEMD
@@ -93,7 +93,7 @@ diff -urN gnome-packagekit-3.6.0/src/Makefile.am gnome-packagekit-3.6.0.new/src/
cancellable = g_cancellable_new ();
markdown = egg_markdown_new ();
egg_markdown_set_output (markdown, EGG_MARKDOWN_OUTPUT_PANGO);
-@@ -3459,6 +3473,8 @@
+@@ -3450,6 +3463,8 @@
if (proxy != NULL)
systemd_proxy_free (proxy);
#endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-packagekit.git/commitdiff/021fb65cc6f6d353cbfd3b0cb664c177583f472d
More information about the pld-cvs-commit
mailing list