diff --git a/0001-Perform-the-simulation-of-spawned-transactions-corre.patch b/0001-Perform-the-simulation-of-spawned-transactions-corre.patch new file mode 100644 index 0000000..c7f0901 --- /dev/null +++ b/0001-Perform-the-simulation-of-spawned-transactions-corre.patch @@ -0,0 +1,29 @@ +From fc9b6653a3f6ca4c1b27045292f7e09bdfb865ca Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Tue, 30 Oct 2012 16:09:17 +0000 +Subject: [PATCH] Perform the simulation of spawned transactions correctly + +Backends that were checking for 'simulate' were being sent the typo 'simluate' +by the daemon which was producing undefined and unexpected results. + +Hopefully fixes: https://bugzilla.redhat.com/show_bug.cgi?id=866486 +--- + lib/packagekit-glib2/pk-enum.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/packagekit-glib2/pk-enum.c b/lib/packagekit-glib2/pk-enum.c +index bc08d7c..8f556a6 100644 +--- a/lib/packagekit-glib2/pk-enum.c ++++ b/lib/packagekit-glib2/pk-enum.c +@@ -401,7 +401,7 @@ static const PkEnumMatch enum_upgrade_kind[] = { + static const PkEnumMatch enum_transaction_flag[] = { + {PK_TRANSACTION_FLAG_ENUM_NONE, "none"}, /* fall though value */ + {PK_TRANSACTION_FLAG_ENUM_ONLY_TRUSTED, "only-trusted"}, +- {PK_TRANSACTION_FLAG_ENUM_SIMULATE, "simluate"}, ++ {PK_TRANSACTION_FLAG_ENUM_SIMULATE, "simulate"}, + {PK_TRANSACTION_FLAG_ENUM_ONLY_DOWNLOAD, "only-download"}, + {0, NULL} + }; +-- +1.7.12.1 + diff --git a/PackageKit.spec b/PackageKit.spec index 9e04a8b..f388039 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -3,7 +3,8 @@ Summary: Package management service Name: PackageKit Version: 0.8.4 -Release: 5%{?dist} +Release: 6%{?dist} + License: GPLv2+ and LGPLv2+ URL: http://www.packagekit.org Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz @@ -17,8 +18,8 @@ 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 -# fix simulate typo in enums.py -Patch50: PackageKit-0.8.4-enums_typo.patch +# Already upstream +Patch5: 0001-Perform-the-simulation-of-spawned-transactions-corre.patch # upstream patches Patch103: 0003-Change-the-priority-state-changed-timeout-to-2-secon.patch @@ -265,7 +266,7 @@ 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 -%patch50 -p1 +%patch5 -p1 -b .simulate-typo %patch103 -p1 -b .0003 %patch104 -p1 -b .0004 %patch105 -p1 -b .remote-dbus-error @@ -482,8 +483,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/packagekit-plugin.pc %changelog -* Tue Oct 30 2012 Rex Dieter 0.8.4-5 -- fix enums.py typo +* Tue Oct 30 2012 Richard Hughes - 0.8.4-6 +- Perform the simulation of spawned transactions correctly (#866486) * Mon Oct 08 2012 Rex Dieter 0.8.4-4 - -yum: Requires: yum >= 3.4.3-45