From 10b7b47fed486fa80640b924a0822c790d05aed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
Date: Tue, 8 Apr 2014 16:06:50 +0200
Subject: [PATCH] Update to latest upstream release

---
 .gitignore                                  |  1 +
 PackageKit-Qt.spec                          | 21 +++++++++++---
 packagekit-qt-add-missing-config-file.patch | 32 +++++++++++++++++++++
 sources                                     |  2 +-
 4 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 packagekit-qt-add-missing-config-file.patch

diff --git a/.gitignore b/.gitignore
index 02caa17..5922171 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /PackageKit-Qt-0.8.6.tar.gz
 /PackageKit-Qt-0.8.7.tar.xz
 /PackageKit-Qt-0.8.8.tar.xz
+/QPACKAGEKIT_0_8_9.tar.gz
diff --git a/PackageKit-Qt.spec b/PackageKit-Qt.spec
index 732ecb6..abe853e 100644
--- a/PackageKit-Qt.spec
+++ b/PackageKit-Qt.spec
@@ -1,11 +1,19 @@
+%global gitTag QPACKAGEKIT_0_8_9
+
 Summary:   Qt support library for PackageKit
 Name:      PackageKit-Qt
-Version:   0.8.8
-Release:   2%{?dist}
+Version:   0.8.9
+Release:   1%{?dist}
 
 License:   LGPLv2+
 URL:       http://www.packagekit.org/
-Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
+
+# Gitorious does not provide final tarballs, but allows downloading gzipp'ed snapshots
+# of specific commits or tags
+Source0:   https://gitorious.org/packagekit/packagekit-qt/archive/%{gitTag}.tar.gz
+
+# Re-add file removed in upstream
+Patch0:    packagekit-qt-add-missing-config-file.patch
 
 BuildRequires: cmake
 BuildRequires: pkgconfig(QtDBus) pkgconfig(QtSql)
@@ -32,7 +40,9 @@ Development headers and libraries for PackageKit-Qt.
 
 
 %prep
-%setup -q
+%setup -q -n packagekit-packagekit-qt
+
+%patch0 -p1 -b .cmake-config
 
 %build
 mkdir -p %{_target_platform}
@@ -67,6 +77,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Tue Apr 08 2014 Daniel Vrátil <dvratil@redhat.com> - 0.8.9-1
+- Update to latest upstream release
+
 * Fri Aug 02 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/packagekit-qt-add-missing-config-file.patch b/packagekit-qt-add-missing-config-file.patch
new file mode 100644
index 0000000..a037e88
--- /dev/null
+++ b/packagekit-qt-add-missing-config-file.patch
@@ -0,0 +1,32 @@
+diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
+index e643a71..0b84840 100755
+--- a/src/modules/CMakeLists.txt
++++ b/src/modules/CMakeLists.txt
+@@ -4,7 +4,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${LIBNAME}-config.cmake.in
+   ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}-config.cmake
+   @ONLY
+ )
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/packagekit-qt-config-version.cmake.in
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${LIBNAME}-config-version.cmake.in
+   ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}-config-version.cmake
+   @ONLY
+ )
+diff --git a/src/modules/packagekit-qt2-config-version.cmake.in b/src/modules/packagekit-qt2-config-version.cmake.in
+new file mode 100644
+index 0000000..860eb70
+--- /dev/null
++++ b/src/modules/packagekit-qt2-config-version.cmake.in
+@@ -0,0 +1,13 @@
++SET(PACKAGE_VERSION @VERSION@)
++IF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
++  SET(PACKAGE_VERSION_EXACT "true")
++ENDIF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
++IF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
++  SET(PACKAGE_VERSION_COMPATIBLE "true")
++ELSE (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
++  SET(PACKAGE_VERSION_UNSUITABLE "true")
++ENDIF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
++IF (PACKAGE_VERSION_UNSUITABLE)
++  MESSAGE("VERSION CHECK FAILED FOR ${PACKAGE_FIND_NAME}. WANTED ${PACKAGE_FIND_VERSION}, HAVE ${PACKAGE_VERSION}")
++ENDIF(PACKAGE_VERSION_UNSUITABLE)
++
diff --git a/sources b/sources
index 0754a86..2287ffd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55ba87425a8d7a8b1f021e8769b88534  PackageKit-Qt-0.8.8.tar.xz
+22cdccfdad1b8146eedab27c90c1da80  QPACKAGEKIT_0_8_9.tar.gz