rpms/PackageKit/F-10 PackageKit-0.3.15-dont-send-sigkill.patch, NONE, 1.1 PackageKit.spec, 1.92, 1.93

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25273

Modified Files:
	PackageKit.spec 
Added Files:
	PackageKit-0.3.15-dont-send-sigkill.patch 
Log Message:
* Wed May 13 2009 Richard Hughes  <rhughes at redhat.com> - 0.3.15-3
- Apply a patch from upstream to disallow SIGKILL.
- Fixes #487924


PackageKit-0.3.15-dont-send-sigkill.patch:

--- NEW FILE PackageKit-0.3.15-dont-send-sigkill.patch ---
diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index 16c10db..7d32523 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -290,6 +290,7 @@ pk_spawn_kill (PkSpawn *spawn)
 	}
 
 	/* the program might not be able to handle SIGQUIT, give it a few seconds and then SIGKILL it */
+	if (0)
 	spawn->priv->kill_id = g_timeout_add (PK_SPAWN_SIGKILL_DELAY, (GSourceFunc) pk_spawn_sigkill_cb, spawn);
 
 	return TRUE;


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-10/PackageKit.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- PackageKit.spec	1 Apr 2009 12:51:33 -0000	1.92
+++ PackageKit.spec	13 May 2009 08:17:54 -0000	1.93
@@ -8,7 +8,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.3.15
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -19,6 +19,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # Set Vendor.conf up for Fedora.
 Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
 
+# Backport from upstream, minimal patch rather than upstream commits
+Patch1:    PackageKit-0.3.15-dont-send-sigkill.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -201,6 +204,7 @@ codecs from configured repositories usin
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -380,8 +384,13 @@ update-mime-database %{_datadir}/mime &>
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Wed May 13 2009 Richard Hughes  <rhughes at redhat.com> - 0.3.15-3
+- Apply a patch from upstream to disallow SIGKILL.
+- Fixes #487924
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.3.15-2
-- rebuild against qt-4.4.x (#493003)
+- Rebuild against qt-4.4.x
+- Fixes #493003
 
 * Mon Mar 30 2009 Richard Hughes  <rhughes at redhat.com> - 0.3.15-1
 - New upstream version
@@ -398,7 +407,8 @@ update-mime-database %{_datadir}/mime &>
 - Drop all upstreamed patches
 
 * Sun Dec 07 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.11-4
-- Add a missing DBUS interface allow rule to fix rh#475074
+- Add a missing DBUS interface allow rule
+- Fixes #475074
 
 * Mon Dec 01 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.11-3
 - Catch errors from yum when getting the comps groups