diff --git a/0001-Ensure-we-cancel-background-transactions-when-an-int.patch b/0001-Ensure-we-cancel-background-transactions-when-an-int.patch new file mode 100644 index 0000000..b625d69 --- /dev/null +++ b/0001-Ensure-we-cancel-background-transactions-when-an-int.patch @@ -0,0 +1,26 @@ +From b8882ca4019d2ffe4a4d9fd980aa75bbabf523d4 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Tue, 18 Sep 2012 10:53:37 +0100 +Subject: [PATCH] Ensure we cancel background transactions when an interactive + transaction is scheduled + +--- + src/pk-transaction-list.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pk-transaction-list.c b/src/pk-transaction-list.c +index a4584cc..605733d 100644 +--- a/src/pk-transaction-list.c ++++ b/src/pk-transaction-list.c +@@ -851,7 +851,7 @@ pk_transaction_list_commit (PkTransactionList *tlist, const gchar *tid) + * transaction foreground? */ + ret = pk_conf_get_bool (tlist->priv->conf, + "CancelBackgroundTransactions"); +- if (!ret) { ++ if (ret) { + if (!item->background && pk_transaction_list_get_background_running (tlist)) { + g_debug ("cancelling running background transactions and instead running %s", + item->tid); +-- +1.7.12 + diff --git a/PackageKit.spec b/PackageKit.spec index 0562c65..109787e 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -3,7 +3,7 @@ Summary: Package management service Name: PackageKit Version: 0.8.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.packagekit.org Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz @@ -20,6 +20,9 @@ Patch4: PackageKit-0.7.4-xulrunner2.patch # Upstream: work around an API break in yum Patch5: 0001-yum-Work-around-a-yum-API-break-so-that-resolving-st.patch +# Upstream: fix a bug preventing background transactions being cancelled +Patch6: 0001-Ensure-we-cancel-background-transactions-when-an-int.patch + Requires: %{name}-glib%{?_isa} = %{version}-%{release} Requires: PackageKit-backend Requires: shared-mime-info @@ -258,6 +261,7 @@ user to restart the computer or remove and re-insert the device. %patch1 -p1 -b .no-time %patch4 -p1 -b .xulrunner2 %patch5 -p1 -b .yum-api-break +%patch6 -p1 -b .background-transactions NOCONFIGURE=1 ./autogen.sh %build @@ -470,6 +474,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/packagekit-plugin.pc %changelog +* Tue Sep 18 2012 Richard Hughes - 0.8.3-4 +- Ensure we cancel background transactions when an interactive + transaction is scheduled. + * Mon Sep 07 2012 Richard Hughes - 0.8.3-3 - Rework the manaully added requires so that PackageKit-glib doesn't pull in so many deps.