[PackageKit/f13/master] Fix command-not-found (#613514)
Michel Alexandre Salim
salimma at fedoraproject.org
Fri Mar 25 09:35:35 UTC 2011
commit 214b00e880f712bb2735d6413cfd37243c4e6ce1
Author: Michel Alexandre Salim <michel.salim at cs.fau.de>
Date: Fri Mar 25 10:36:05 2011 +0100
Fix command-not-found (#613514)
PackageKit-0.6.6-unbreak-cnf.patch | 25 +++++++++++++++++++++++++
PackageKit.spec | 9 ++++++++-
2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/PackageKit-0.6.6-unbreak-cnf.patch b/PackageKit-0.6.6-unbreak-cnf.patch
new file mode 100644
index 0000000..c0243c2
--- /dev/null
+++ b/PackageKit-0.6.6-unbreak-cnf.patch
@@ -0,0 +1,25 @@
+From 83626eb50585400079bc181a9f5b822523435f9e Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Mon, 12 Jul 2010 09:39:24 +0100
+Subject: [PATCH] Unbreak CNF after the daemon moved to libexec. Fixes rh#613514
+
+---
+ contrib/command-not-found/PackageKit.sh.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/contrib/command-not-found/PackageKit.sh.in b/contrib/command-not-found/PackageKit.sh.in
+index de34fe7..8d8eb38 100644
+--- a/contrib/command-not-found/PackageKit.sh.in
++++ b/contrib/command-not-found/PackageKit.sh.in
+@@ -14,7 +14,7 @@ command_not_found_handle () {
+ [ ! -S /var/run/dbus/system_bus_socket ] && runcnf=0
+
+ # don't run if packagekitd doesn't exist in the _system_ root
+- [ ! -x /usr/sbin/packagekitd ] && runcnf=0
++ [ ! -x /usr/libexec/packagekitd ] && runcnf=0
+
+ # run the command, or just print a warning
+ if [ $runcnf -eq 1 ]; then
+--
+1.7.4.1
+
diff --git a/PackageKit.spec b/PackageKit.spec
index fead507..ceab119 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -5,7 +5,7 @@
Summary: Package management service
Name: PackageKit
Version: 0.6.6
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+ and LGPLv2+
Group: System Environment/Libraries
URL: http://www.packagekit.org
@@ -23,6 +23,9 @@ Patch2: PackageKit-0.6.3-disable-zif.patch
# upstream
Patch3: 0001-Recognise-bluetooth-connections-as-mobile-networks.-.patch
+# Unbreak CNF after daemon moved to libexec
+Patch4: PackageKit-0.6.6-unbreak-cnf.patch
+
Requires: PackageKit-glib = %{version}-%{release}
Requires: PackageKit-gtk-module = %{version}-%{release}
Requires: PackageKit-yum-plugin = %{version}-%{release}
@@ -242,6 +245,7 @@ user to restart the computer or remove and re-insert the device.
%patch1 -p1 -b .no-time
%patch2 -p1 -b .no-zif
%patch3 -p1 -b .bt-is-mobile
+%patch4 -p1 -b .unbreak-cnf
%build
%configure \
@@ -453,6 +457,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_includedir}/PackageKit/backend/*.h
%changelog
+* Fri Mar 25 2011 Michel Salim <salimma at fedoraproject.org> - 0.6.6-3
+- Fix command-not-found (#613514)
+
* Wed Sep 01 2010 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.6-2
- Add a conflict with older selinux-policy to fix RH#620943
More information about the scm-commits
mailing list