diff --git a/.gitignore b/.gitignore index e4af983..ef0f786 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ PackageKit-0.6.7.tar.bz2 /PackageKit-0.8.9.tar.xz /PackageKit-0.8.11.tar.xz /PackageKit-0.8.12.tar.xz +/PackageKit-0.8.13.tar.xz diff --git a/0001-systemd-updates-Show-some-text-progress-when-the-off.patch b/0001-systemd-updates-Show-some-text-progress-when-the-off.patch deleted file mode 100644 index d0cdad1..0000000 --- a/0001-systemd-updates-Show-some-text-progress-when-the-off.patch +++ /dev/null @@ -1,70 +0,0 @@ -From c0fa2592d0d4f7ef26b579e5d0e76544dfb16ab7 Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Fri, 1 Nov 2013 13:08:27 +0000 -Subject: [PATCH] systemd-updates: Show some text progress when the offline - update is going on - ---- - contrib/systemd-updates/pk-offline-update.c | 12 +++++++++++- - po/POTFILES.in | 1 + - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/contrib/systemd-updates/pk-offline-update.c b/contrib/systemd-updates/pk-offline-update.c -index f9de773..cf862a4 100644 ---- a/contrib/systemd-updates/pk-offline-update.c -+++ b/contrib/systemd-updates/pk-offline-update.c -@@ -20,6 +20,7 @@ - */ - - #include -+#include - #include - #include - #include -@@ -143,6 +144,12 @@ pk_offline_update_progress_cb (PkProgress *progress, - if (percentage < 0) - goto out; - -+ /* TRANSLATORS: this is the message we send plymouth to -+ * advise of the new percentage completion */ -+ msg = g_strdup_printf ("%s - %i%%", _("Installing Updates"), percentage); -+ if (percentage > 10) -+ pk_offline_update_set_plymouth_msg (msg); -+ - /* print on terminal */ - pk_progress_bar_set_percentage (progressbar, percentage); - -@@ -176,7 +183,8 @@ pk_offline_update_reboot (void) - - /* reboot using systemd */ - pk_offline_update_set_plymouth_mode ("shutdown"); -- pk_offline_update_set_plymouth_msg ("Rebooting after installing updates..."); -+ /* TRANSLATORS: we've finished doing offline updates */ -+ pk_offline_update_set_plymouth_msg (_("Rebooting after installing updates…")); - connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); - if (connection == NULL) { - g_warning ("Failed to get system bus connection: %s", -@@ -481,6 +489,8 @@ main (int argc, char *argv[]) - task = pk_task_new (); - pk_task_set_interactive (task, FALSE); - pk_offline_update_set_plymouth_mode ("updates"); -+ /* TRANSLATORS: we've started doing offline updates */ -+ pk_offline_update_set_plymouth_msg (_("Installing updates, this could take a while…")); - package_ids = g_strsplit (packages_data, "\n", -1); - pk_offline_update_write_dummy_results (package_ids); - results = pk_client_update_packages (PK_CLIENT (task), -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 4a06d8b..7964c76 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -8,6 +8,7 @@ contrib/browser-plugin/pk-plugin-install.c - contrib/command-not-found/pk-command-not-found.c - contrib/debuginfo-install/pk-debuginfo-install.c - contrib/device-rebind/pk-device-rebind.c -+contrib/systemd-updates/pk-offline-update.c - data/packagekit-catalog.xml.in - data/packagekit-package-list.xml.in - data/packagekit-servicepack.xml.in --- -1.8.3.1 - diff --git a/PackageKit.spec b/PackageKit.spec index b9826f6..dcacf05 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -5,8 +5,8 @@ Summary: Package management service Name: PackageKit -Version: 0.8.12 -Release: 3%{?dist} +Version: 0.8.13 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.packagekit.org Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz @@ -20,9 +20,6 @@ Patch1: PackageKit-0.4.4-Fedora-turn-off-time.conf.patch # Upstreamable? allow use of xulrunner2 for browser-plugin support Patch4: PackageKit-0.7.4-xulrunner2.patch -# Upstream -Patch5: 0001-systemd-updates-Show-some-text-progress-when-the-off.patch - Requires: %{name}-glib%{?_isa} = %{version}-%{release} Requires: PackageKit-backend Requires: shared-mime-info @@ -31,7 +28,7 @@ Requires: systemd # required by patch4 BuildRequires: automake gtk-doc libtool -BuildRequires: glib2-devel >= 2.16.1 +BuildRequires: glib2-devel >= 2.32.0 BuildRequires: dbus-devel >= 1.1.1 BuildRequires: dbus-glib-devel >= 0.74 BuildRequires: pam-devel @@ -253,7 +250,6 @@ user to restart the computer or remove and re-insert the device. %patch0 -p1 -b .fedora %patch1 -p1 -b .no-time %patch4 -p1 -b .xulrunner2 -%patch5 -p1 -b .show-progress-offline-updates NOCONFIGURE=1 ./autogen.sh @@ -366,6 +362,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/girepository-1.0/PackageKitPlugin-1.0.typelib %{_datadir}/dbus-1/interfaces/*.xml /usr/lib/systemd/system/packagekit-offline-update.service +/usr/lib/systemd/system/packagekit.service %{_libexecdir}/pk-*offline-update %files docs @@ -456,6 +453,19 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/packagekit-plugin.pc %changelog +* Fri Nov 22 2013 Richard Hughes - 0.8.13-1 +- New upstream release +- Add a systemd packagekit.service file +- Do not abort the daemon if we can't write to a database +- Do not proxy the action states when simulating +- Don't crash if ProxyHTTP is set +- Fix several small memory leaks +- Log all systemd-updates warnings and notices to the journal +- Raise the GLib dep to 2.32 +- Remove duplicate assignment of pkcon '-y' option +- hawkey: Lots of bugfixes and new features +- yum: Do not auto-close the rpmdb when running a transaction + * Mon Nov 04 2013 Rex Dieter 0.8.12-3 - own %%{_libdir}/packageKit-plugins diff --git a/sources b/sources index a4c7f28..35c8eb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f065f1baad8ccf7dbecf045cb058f26 PackageKit-0.8.12.tar.xz +c8f7207cca4fcdb3d62d012b67c2f319 PackageKit-0.8.13.tar.xz