forked from rpms/PackageKit
New upstream release.
Lots of Zif updates Offset the cache age by 30 minutes Use the newest filter when resolving for new packages to install
This commit is contained in:
parent
3a0fac468d
commit
c5be83a5e1
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,3 +11,4 @@ PackageKit-0.6.7.tar.bz2
|
||||
/PackageKit-0.6.16.tar.xz
|
||||
/PackageKit-0.6.17.tar.xz
|
||||
/PackageKit-0.6.18.tar.xz
|
||||
/PackageKit-0.6.19.tar.xz
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
From 1d6670cdc2ed9a20166fe66410da28df71e43d3f Mon Sep 17 00:00:00 2001
|
||||
From: Denis Washington <denisw@online.de>
|
||||
Date: Wed, 31 Aug 2011 22:41:20 +0100
|
||||
Subject: [PATCH] Use g_unix_signal_add_full() which has been renamed in the
|
||||
unstable GLib branch
|
||||
|
||||
Signed-off-by: Richard Hughes <richard@hughsie.com>
|
||||
---
|
||||
src/pk-main.c | 16 ++++++++--------
|
||||
1 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/pk-main.c b/src/pk-main.c
|
||||
index 12b26f6..45feed9 100644
|
||||
--- a/src/pk-main.c
|
||||
+++ b/src/pk-main.c
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <dbus/dbus-glib-lowlevel.h>
|
||||
#include <packagekit-glib2/pk-debug.h>
|
||||
|
||||
-#if GLIB_CHECK_VERSION(2,29,4)
|
||||
+#if GLIB_CHECK_VERSION(2,29,19)
|
||||
#include <glib-unix.h>
|
||||
#endif
|
||||
|
||||
@@ -159,7 +159,7 @@ pk_main_quit_cb (PkEngine *engine, GMainLoop *mainloop)
|
||||
g_main_loop_quit (mainloop);
|
||||
}
|
||||
|
||||
-#if GLIB_CHECK_VERSION(2,29,4)
|
||||
+#if GLIB_CHECK_VERSION(2,29,19)
|
||||
|
||||
/**
|
||||
* pk_main_sigint_cb:
|
||||
@@ -271,13 +271,13 @@ main (int argc, char *argv[])
|
||||
goto exit_program;
|
||||
}
|
||||
|
||||
-#if GLIB_CHECK_VERSION(2,29,4)
|
||||
+#if GLIB_CHECK_VERSION(2,29,19)
|
||||
/* do stuff on ctrl-c */
|
||||
- g_unix_signal_add_watch_full (SIGINT,
|
||||
- G_PRIORITY_DEFAULT,
|
||||
- pk_main_sigint_cb,
|
||||
- loop,
|
||||
- NULL);
|
||||
+ g_unix_signal_add_full (G_PRIORITY_DEFAULT,
|
||||
+ SIGINT,
|
||||
+ pk_main_sigint_cb,
|
||||
+ loop,
|
||||
+ NULL);
|
||||
#else
|
||||
signal (SIGINT, pk_main_sigint_handler);
|
||||
#endif
|
||||
--
|
||||
1.7.6.1
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
Summary: Package management service
|
||||
Name: PackageKit
|
||||
Version: 0.6.18
|
||||
Release: 2%{?dist}
|
||||
Version: 0.6.19
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: http://www.packagekit.org
|
||||
Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
|
||||
@ -14,9 +14,6 @@ Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch
|
||||
# Fedora specific: the yum backend doesn't do time estimation correctly
|
||||
Patch1: PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
|
||||
|
||||
# Already upstream, fix a compile failure
|
||||
Patch2: 0001-Use-g_unix_signal_add_full-which-has-been-renamed-in.patch
|
||||
|
||||
Requires: PackageKit-glib = %{version}-%{release}
|
||||
Requires: PackageKit-backend
|
||||
Requires: shared-mime-info
|
||||
@ -51,7 +48,7 @@ BuildRequires: pango-devel
|
||||
BuildRequires: pm-utils-devel
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: zif-devel >= 0.1.3
|
||||
BuildRequires: zif-devel >= 0.2.5
|
||||
|
||||
# functionality moved to udev itself
|
||||
Obsoletes: PackageKit-udev-helper < %{version}-%{release}
|
||||
@ -77,7 +74,7 @@ A backend for PackageKit to enable yum functionality.
|
||||
%package zif
|
||||
Summary: PackageKit Zif backend
|
||||
Group: System Environment/Libraries
|
||||
Requires: zif >= 0.1.3
|
||||
Requires: zif >= 0.2.5
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: PackageKit-backend
|
||||
|
||||
@ -253,7 +250,6 @@ user to restart the computer or remove and re-insert the device.
|
||||
%setup -q
|
||||
%patch0 -p1 -b .fedora
|
||||
%patch1 -p1 -b .no-time
|
||||
%patch2 -p1 -b .glib-api-change
|
||||
|
||||
%build
|
||||
%configure \
|
||||
@ -467,6 +463,12 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
|
||||
%{_includedir}/PackageKit/backend/*.h
|
||||
|
||||
%changelog
|
||||
* Tue Oct 04 2011 Richard Hughes <rhughes@redhat.com> - 0.6.19-1
|
||||
- New upstream release.
|
||||
- Lots of Zif updates
|
||||
- Offset the cache age by 30 minutes
|
||||
- Use the newest filter when resolving for new packages to install
|
||||
|
||||
* Fri Sep 09 2011 Richard Hughes <rhughes@redhat.com> - 0.6.18-2
|
||||
- Backport a patch from upstream as glib2 had an API change that
|
||||
affects PackageKit.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user