diff --git a/.gitignore b/.gitignore index 9c2b48a..400b4da 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ PackageKit-0.6.7.tar.bz2 /libdnf-3675456.tar.gz /PackageKit-1.1.5.tar.xz /libdnf-fe5a08b.tar.gz +/PackageKit-1.1.6.tar.xz diff --git a/0001-offline-updates-various-tweaks-to-the-service-file.patch b/0001-offline-updates-various-tweaks-to-the-service-file.patch deleted file mode 100644 index b2caab4..0000000 --- a/0001-offline-updates-various-tweaks-to-the-service-file.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5690867b175c49387dd799f96f8d07c67b1f4170 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Thu, 23 Mar 2017 15:37:29 -0400 -Subject: [PATCH 3/3] offline-updates: various tweaks to the service file -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- Change description to "Update ...", because systemd uses the - Description when starting and stopping units, and "Starting Update - the OS…" better than "Starting Updates the OS…". - -- Add After=dbus.socket. a54c5ae66c8f8 added Requires=, but Requires= - without After= is useless for socket units. - -- Add DefaultDependencies=no to drop the dependency on basic.target, - and add Requires=sysinit.target, After=sysinit.target - systemd-journald.socket, Before=shutdown.target system-update.target - to re-add the dependencies that are necessary. - - Because of the dependency on dbus.socket, which starts dbus.service, - we still have a dependency on basic.target. (As soon as a connection - to the socket is made, dbus.service will be started, and since - dbus.service has DefaultDependencies=yes, we'll wait for - basic.target to be reached.) But we might be started without our - symlink being in place and exit without doing anything. In that case - basic.target might not be needed. This allows other upgrade - mechanism which do not require dbus to proceed. - -- Change OnFailure to FailureAction — more modern and nicer syntax, and - the target is started irreplaceably, which should be more robust. - -- Change to Type=oneshot. The default is Type=simple, which means that - systemd considers the unit started immediately, which means that it - races with the system-update-cleanup.service which is started after - system-update.target is reached. - - https://bugzilla.redhat.com/show_bug.cgi?id=1430920 ---- - data/packagekit-offline-update.service.in | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/data/packagekit-offline-update.service.in b/data/packagekit-offline-update.service.in -index 0b9da3a..c8e4394 100644 ---- a/data/packagekit-offline-update.service.in -+++ b/data/packagekit-offline-update.service.in -@@ -1,7 +1,13 @@ - [Unit] --Description=Updates the operating system whilst offline --Requires=dbus.socket --OnFailure=reboot.target -+Description=Update the operating system whilst offline -+ -+DefaultDependencies=no -+Requires=sysinit.target dbus.socket -+After=sysinit.target dbus.socket systemd-journald.socket -+Before=shutdown.target system-update.target - - [Service] -+Type=oneshot - ExecStart=@libexecdir@/pk-offline-update -+ -+FailureAction=reboot diff --git a/PackageKit.spec b/PackageKit.spec index 3d6982e..7d103f3 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -13,8 +13,8 @@ Summary: Package management service Name: PackageKit -Version: 1.1.5 -Release: 4%{?dist} +Version: 1.1.6 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.freedesktop.org/software/PackageKit/ Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz @@ -29,9 +29,6 @@ Provides: bundled(libdnf) = 0.7.0 # Fedora-specific: set Vendor.conf up for Fedora. Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch -# Fix the offline updater to work with latest systemd -# https://github.com/hughsie/PackageKit/pull/72 -Patch1: 0001-offline-updates-various-tweaks-to-the-service-file.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: xmlto @@ -192,7 +189,6 @@ tar -xf %{S:1} %endif %patch0 -p1 -b .fedora -%patch1 -p1 %build %if 0%{?bundled_libdnf} @@ -343,6 +339,10 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || : %{_datadir}/vala/vapi/packagekit-glib2.vapi %changelog +* Wed Jun 07 2017 Richard Hughes - 1.1.6-1 +- New upstream release +- Ensure AppStream is deployed when the repo is updated + * Fri Mar 24 2017 Kalev Lember - 1.1.5-4 - Fix the offline updater to work with latest systemd (#1430920) diff --git a/sources b/sources index 2e0ad06..cd1fb88 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (PackageKit-1.1.5.tar.xz) = ecc6a4d39caa0a7ea2047f52f95980b23e61ae200e27559326f03302b1c0d798f9cbae53fcf2d397dca3d54e52f143e2e7aa4e3f0b2df8c39e53bd2993e86154 -SHA512 (libdnf-fe5a08b.tar.gz) = c0fb4aec9bc37e69680702d02752e81461d023f423c8f71d1921f6a4579aedaad91cb51d818557b08f2abe23f1a948439f37595d98583ee0110b31d893543fb7 +SHA512 (PackageKit-1.1.6.tar.xz) = a48256abb832d5f30d21e70ea07c12f577d95d32eb53f43d1d4ebc3dc83d58926bc134eaf576c981222c09a78493e1ddc2fb338a100afdabd7ee1cd82fd5536b