From 8f6a7e4acad85ebded3e42fa8b11a7d4611a81ca Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 9 May 2013 13:51:36 +0100
Subject: [PATCH] New upstream release

---
 .gitignore                                    |  1 +
 ...-an-error-if-we-fail-to-contact-Pack.patch | 79 -------------------
 PackageKit-Qt.spec                            | 25 +++---
 sources                                       |  2 +-
 4 files changed, 18 insertions(+), 89 deletions(-)
 delete mode 100644 0005-Make-sure-we-set-an-error-if-we-fail-to-contact-Pack.patch

diff --git a/.gitignore b/.gitignore
index 5c5bd3c..02caa17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /PackageKit-Qt-0.8.6.tar.gz
 /PackageKit-Qt-0.8.7.tar.xz
+/PackageKit-Qt-0.8.8.tar.xz
diff --git a/0005-Make-sure-we-set-an-error-if-we-fail-to-contact-Pack.patch b/0005-Make-sure-we-set-an-error-if-we-fail-to-contact-Pack.patch
deleted file mode 100644
index f31c461..0000000
--- a/0005-Make-sure-we-set-an-error-if-we-fail-to-contact-Pack.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From da41de0e4a98eed232eb05a14e903666dbb21838 Mon Sep 17 00:00:00 2001
-From: Daniel Nicoletti <dantti12@gmail.com>
-Date: Thu, 7 Mar 2013 00:40:13 -0300
-Subject: [PATCH 5/5] Make sure we set an error if we fail to contact
- PackageKit Fixes KDE Bug: 315009
-
----
- src/transaction.cpp | 35 ++++++++++++++++++-----------------
- 1 file changed, 18 insertions(+), 17 deletions(-)
-
-diff --git a/src/transaction.cpp b/src/transaction.cpp
-index 47b3c56..41884a7 100644
---- a/src/transaction.cpp
-+++ b/src/transaction.cpp
-@@ -67,19 +67,19 @@ bool Transaction::init(const QDBusObjectPath &tid)
-     // he want us to get it
-     if (tid.path().isNull()) {
-         d->tid = Daemon::global()->getTid();
-+        if (d->tid.path().isEmpty()) {
-+            d->error = Transaction::InternalErrorDaemonUnreachable;
-+            return false;
-+        }
-     } else {
-         d->tid = tid;
-     }
- 
--    if (d->tid.path().isEmpty()) {
--        d->error = Transaction::InternalErrorDaemonUnreachable;
--        return false;
--    } else {
--        
--    }
--
-     int retry = 0;
-     do {
-+        if (d->p) {
-+            delete d->p;
-+        }
-         d->p = new TransactionProxy(QLatin1String(PK_NAME),
-                                     d->tid.path(),
-                                     QDBusConnection::systemBus(),
-@@ -95,23 +95,24 @@ bool Transaction::init(const QDBusObjectPath &tid)
-             message << qVariantFromValue(0U);
-             QDBusConnection::sessionBus().call(message, QDBus::BlockWithGui);
- 
--            // The transaction was not created
--            delete d->p;
--            d->p = 0;
-             retry++;
-         } else {
-             retry = 0;
-         }
-     } while (retry == 1);
- 
--    // if the transaction proxy was not created return false
--    if (!d->p) {
-+    // if the transaction proxy was not created return false and set the error
-+    if (!d->p->isValid()) {
-+        // The transaction was not created
-+        d->error = Transaction::InternalErrorCannotStartDaemon;
-+        emit errorCode(Transaction::ErrorInternalError, d->p->lastError().message());
-+        delete d->p;
-         return false;
--    } else {
--        d->error = Transaction::InternalErrorNone;
--        if (!Daemon::global()->hints().isEmpty()) {
--            setHints(Daemon::global()->hints());
--        }
-+    }
-+
-+    d->error = Transaction::InternalErrorNone;
-+    if (!Daemon::global()->hints().isEmpty()) {
-+        setHints(Daemon::global()->hints());
-     }
- 
-     connect(d->p, SIGNAL(Changed()),
--- 
-1.8.1.4
-
diff --git a/PackageKit-Qt.spec b/PackageKit-Qt.spec
index 9be501c..55fd3ca 100644
--- a/PackageKit-Qt.spec
+++ b/PackageKit-Qt.spec
@@ -1,15 +1,12 @@
 Summary:   Qt support library for PackageKit
 Name:      PackageKit-Qt
-Version:   0.8.7
-Release:   3%{?dist}
+Version:   0.8.8
+Release:   1%{?dist}
 
 License:   LGPLv2+
 URL:       http://www.packagekit.org/
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
 
-## upstream patches
-Patch100: 0005-Make-sure-we-set-an-error-if-we-fail-to-contact-Pack.patch
-
 BuildRequires: cmake
 BuildRequires: pkgconfig(QtDBus) pkgconfig(QtSql)
 
@@ -37,9 +34,6 @@ Development headers and libraries for PackageKit-Qt.
 %prep
 %setup -q
 
-%patch100 -p1 -b .0005
-
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -61,7 +55,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %files
 %doc AUTHORS NEWS COPYING
 %{_libdir}/libpackagekit-qt2.so.%{version}
-%{_libdir}/libpackagekit-qt2.so.5*
+%{_libdir}/libpackagekit-qt2.so.6*
 
 %files devel
 %{_libdir}/libpackagekit-qt2.so
@@ -73,6 +67,19 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Thu May 09 2013 Richard Hughes <richard@hughsie.com> 0.8.8-1
+- New upstream release
+- Adding Provides property to Daemon
+- Adding some Meta information
+- Add missing declare enums
+- Adds the transactionFlags to the Transaction class
+- Add TransactionFlags registration
+- Fix searchGroups() be iterating over the flaged values
+- Ignore Interface isValid() check
+- Implement connectNotify and disconnectNotify
+- Improve error handling and make it easier for QML use it
+- Make sure we set an error if we fail to contact PackageKit
+
 * Thu Mar 07 2013 Rex Dieter <rdieter@fedoraproject.org> 0.8.7-3
 - pickup/test upstream crash fix (kde#315009)
 
diff --git a/sources b/sources
index fe9ef64..0754a86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-662c462d46a2501495860f131a411a85  PackageKit-Qt-0.8.7.tar.xz
+55ba87425a8d7a8b1f021e8769b88534  PackageKit-Qt-0.8.8.tar.xz