From 576589fb176a7699524397ba5ad127ef289fe541 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 21 2020 21:41:16 +0000
Subject: import PackageKit-1.1.12-4.el8


---

diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/0001-command-not-found-Don-t-use-a-bash-regex-to-fix-othe.patch b/SOURCES/0001-command-not-found-Don-t-use-a-bash-regex-to-fix-othe.patch
new file mode 100644
index 0000000..2e66f5e
--- /dev/null
+++ b/SOURCES/0001-command-not-found-Don-t-use-a-bash-regex-to-fix-othe.patch
@@ -0,0 +1,25 @@
+From bb5d77c89eb0f98e7a76b7cdf14cfe9e79d387fa Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 25 Nov 2019 11:49:06 +0000
+Subject: [PATCH] command-not-found: Don't use a bash regex to fix other shells
+
+---
+ contrib/command-not-found/PackageKit.sh.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/command-not-found/PackageKit.sh.in b/contrib/command-not-found/PackageKit.sh.in
+index ea90981f7..1e1fcdffd 100644
+--- a/contrib/command-not-found/PackageKit.sh.in
++++ b/contrib/command-not-found/PackageKit.sh.in
+@@ -11,7 +11,7 @@ command_not_found_handle () {
+ 	local retval=127
+ 
+ 	# only search for the command if we're interactive
+-	[[ $- =~ i ]] || runcnf=0
++	[[ $- == *"i"* ]] || runcnf=0
+ 
+ 	# don't run if DBus isn't running
+ 	[[ ! -S /run/dbus/system_bus_socket ]] && runcnf=0
+-- 
+2.23.0
+
diff --git a/SPECS/PackageKit.spec b/SPECS/PackageKit.spec
index ead630f..fc7b0fd 100644
--- a/SPECS/PackageKit.spec
+++ b/SPECS/PackageKit.spec
@@ -14,7 +14,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   1.1.12
-Release:   3%{?dist}
+Release:   4%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/PackageKit/
 Source0:   http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
@@ -33,6 +33,7 @@ Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
 # Backported from upstream
 Patch1:    0001-dnf-Invalidate-the-sack-cache-after-downloading-new-.patch
 Patch2:    0001-dnf-Don-t-override-DnfContext-s-release_ver-for-the-.patch
+Patch3:    0001-command-not-found-Don-t-use-a-bash-regex-to-fix-othe.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: xmlto
@@ -334,8 +335,9 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %{_datadir}/vala/vapi/packagekit-glib2.vapi
 
 %changelog
-* Thu Aug 01 2019 CentOS Sources <bugs@centos.org> - 1.1.12-3.el8.centos
-- Apply debranding changes
+* Mon Nov 25 2019 Richard Hughes <rhughes@redhat.com> - 1.1.12-4
+- Do not use a bash regex to fix CNF on shells other than bash
+- Resolves: #1728855
 
 * Wed May 29 2019 Kalev Lember <klember@redhat.com> - 1.1.12-3
 - Backport a patch to improve release_ver handling (#1714439)