From 50ee91eca2ab927c33c9193fc4b05996d06fc1ad Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Mon, 6 Aug 2012 16:16:15 +0100
Subject: [PATCH] New upstream release

- This is the first release that allows transactions to run in parallel
- The zif backend can run in parallel by default, the yum backend still
  runs each transaction one at a time
- Save the transaction flags when removing packages
- Fix a python backtrace when removing a package
- Add GStreamer 1.0 support to the PackageKit plugin
- Add WritePreparedUpdates config item for admins
---
 .gitignore              |  1 +
 PackageKit-master.patch | 36 ------------------------------------
 PackageKit.spec         | 18 ++++++++++++------
 sources                 |  2 +-
 4 files changed, 14 insertions(+), 43 deletions(-)
 delete mode 100644 PackageKit-master.patch

diff --git a/.gitignore b/.gitignore
index d29e3ac..8a41461 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ PackageKit-0.6.7.tar.bz2
 /PackageKit-0.7.4.tar.xz
 /PackageKit-0.8.1.tar.xz
 /PackageKit-0.8.2.tar.xz
+/PackageKit-0.8.3.tar.xz
diff --git a/PackageKit-master.patch b/PackageKit-master.patch
deleted file mode 100644
index 4f1fa50..0000000
--- a/PackageKit-master.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
-index 0748264..f5216ec 100755
---- a/backends/yum/yumBackend.py
-+++ b/backends/yum/yumBackend.py
-@@ -3254,7 +3254,7 @@ class DownloadCallback(BaseMeter):
-         if name:
-             pkg = self._getPackage(name)
-             if pkg:
--                self.base.item_progress(self.base._pkg_to_id(pkg), val)
-+                self.base.item_progress(self.base._pkg_to_id(pkg), STATUS_DOWNLOAD, val)
- 
-         # package finished
-         if val == 100 and name:
-@@ -3312,16 +3312,17 @@ class PackageKitCallback(RPMBaseCallback):
-                 self.base.message(MESSAGE_BACKEND_ERROR, "The constant '%s' was unknown, please report. details: %s" % (action, _to_unicode(e)))
- 
-         # set item percentage
--        #if package and te_total > 0:
--        #    val = (te_current*100L)/te_total
--        #    if self.curpkg:
--        #        self.base.item_progress(self.base._pkg_to_id(self.curpkg), val)
-+        if package and te_total > 0:
-+            val = (te_current*100L) / te_total
-+            if self.curpkg:
-+                self.base.item_progress(self.base._pkg_to_id(self.curpkg), STATUS_INSTALL, val)
- 
-         # find out the offset
-         pct_start = StatusPercentageMap[STATUS_INSTALL]
- 
-         # do percentage
--        if ts_total > 0:
-+        if ts_total > 0 and te_total > 0:
-+            val = (te_current * 100L) / te_total
-             div = (100 - pct_start) / ts_total
-             pct = div * (ts_current - 1) + pct_start + ((div / 100.0) * val)
-             self.base.percentage(pct)
diff --git a/PackageKit.spec b/PackageKit.spec
index 0b7ec39..869eeae 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -2,8 +2,8 @@
 
 Summary:   Package management service
 Name:      PackageKit
-Version:   0.8.2
-Release:   3%{?dist}
+Version:   0.8.3
+Release:   1%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
@@ -17,9 +17,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
 
-# Backported from master
-Patch9: PackageKit-master.patch
-
 Requires: %{name}-glib%{?_isa} = %{version}-%{release}
 Requires: PackageKit-backend
 Requires: shared-mime-info
@@ -258,7 +255,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
-%patch9 -p1 -b .master
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -471,6 +467,16 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/pkgconfig/packagekit-plugin.pc
 
 %changelog
+* Mon Aug 06 2012 Richard Hughes  <rhughes@redhat.com> - 0.8.3-1
+- New upstream release
+- This is the first release that allows transactions to run in parallel
+- The zif backend can run in parallel by default, the yum backend still
+  runs each transaction one at a time
+- Save the transaction flags when removing packages
+- Fix a python backtrace when removing a package
+- Add GStreamer 1.0 support to the PackageKit plugin
+- Add WritePreparedUpdates config item for admins
+
 * Tue Jul 24 2012 Richard Hughes  <rhughes@redhat.com> - 0.8.2-3
 - Fix several reported problems with the offline-update funtionality.
 
diff --git a/sources b/sources
index 59ff4d0..75dd21a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ba2b1eb571daac0890f45da79f7e377  PackageKit-0.8.2.tar.xz
+53210d9a54d3c9044e4c6edc16c99bd4  PackageKit-0.8.3.tar.xz