From b969216a39ece37005a7a63b34dea1655ac40988 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Feb 21 2015 16:24:30 +0000 Subject: Update to 1.0.5 --- diff --git a/.gitignore b/.gitignore index f6977d1..794287f 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ PackageKit-0.6.7.tar.bz2 /PackageKit-1.0.1.tar.xz /PackageKit-1.0.3.tar.xz /PackageKit-1.0.4.tar.xz +/PackageKit-1.0.5.tar.xz diff --git a/0001-hif-Adapt-to-the-new-Hawkey-API.patch b/0001-hif-Adapt-to-the-new-Hawkey-API.patch deleted file mode 100644 index d62afd2..0000000 --- a/0001-hif-Adapt-to-the-new-Hawkey-API.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5630095714ec012401accddb070c9850dad7773d Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Fri, 6 Feb 2015 20:14:16 +0000 -Subject: [PATCH] hif: Adapt to the new Hawkey API - ---- - backends/hif/pk-backend-hif.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/backends/hif/pk-backend-hif.c b/backends/hif/pk-backend-hif.c -index bc9bef2..2e497cd 100644 ---- a/backends/hif/pk-backend-hif.c -+++ b/backends/hif/pk-backend-hif.c -@@ -650,7 +650,11 @@ hif_utils_create_sack_for_filters (PkBackendJob *job, - /* create empty sack */ - solv_dir = hif_utils_real_path (hif_context_get_solv_dir (priv->context)); - install_root = hif_utils_real_path (hif_context_get_install_root (priv->context)); -+#if HY_VERSION_CHECK(0,5,3) -+ sack = hy_sack_create (solv_dir, NULL, install_root, NULL, HY_MAKE_CACHE_DIR); -+#else - sack = hy_sack_create (solv_dir, NULL, install_root, HY_MAKE_CACHE_DIR); -+#endif - if (sack == NULL) { - ret = hif_error_set_from_hawkey (hy_get_errno (), error); - g_prefix_error (error, "failed to create sack in %s for %s: ", --- -2.1.0 - diff --git a/PackageKit.spec b/PackageKit.spec index dde249a..5ca3aaf 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -6,8 +6,8 @@ Summary: Package management service Name: PackageKit -Version: 1.0.4 -Release: 2%{?dist} +Version: 1.0.5 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.freedesktop.org/software/PackageKit/ Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz @@ -18,9 +18,6 @@ Source1: cached-metadata.tar # Fedora-specific: set Vendor.conf up for Fedora. Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch -# Already upstream -Patch1: 0001-hif-Adapt-to-the-new-Hawkey-API.patch - Requires: %{name}-glib%{?_isa} = %{version}-%{release} Requires: shared-mime-info Requires: comps-extras @@ -176,7 +173,6 @@ using PackageKit. %prep %setup -q %patch0 -p1 -b .fedora -%patch1 -p1 -b .new-hawkey-api %build %configure \ @@ -315,6 +311,9 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || : %{_datadir}/gtk-doc/html/PackageKit %changelog +* Sat Feb 21 2015 Kalev Lember - 1.0.5-1 +- Update to 1.0.5 + * Fri Feb 06 2015 Richard Hughes - 1.0.4-2 - Adapt to the new hawkey API. diff --git a/sources b/sources index f41991b..5ddd728 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4a07aa7e4c76052b2edf0765c26d2e35 PackageKit-1.0.4.tar.xz +1b7b4f820d522cf5fb1d4449afd89a27 PackageKit-1.0.5.tar.xz 83b77f380c3955bc1bee467c8ddf5b3b cached-metadata.tar