From c79378641815bf367ff721057a56f6d6264f0a88 Mon Sep 17 00:00:00 2001
From: anolis-bot <sam.zyc@alibaba-inc.com>
Date: Thu, 10 Nov 2022 20:18:13 +0800
Subject: [PATCH] update to which-2.21-18.el8

Signed-off-by: anolis-bot <sam.zyc@alibaba-inc.com>
---
 dist       |  1 +
 which.spec | 23 ++++-------------------
 which2.sh  |  2 +-
 3 files changed, 6 insertions(+), 20 deletions(-)
 create mode 100644 dist

diff --git a/dist b/dist
new file mode 100644
index 0000000..9c0e36e
--- /dev/null
+++ b/dist
@@ -0,0 +1 @@
+an8
diff --git a/which.spec b/which.spec
index cbac0db..c63644b 100644
--- a/which.spec
+++ b/which.spec
@@ -1,8 +1,7 @@
-%define anolis_release .0.1
 Summary: Displays where a particular program in your path is located
 Name: which
 Version: 2.21
-Release: 17%{anolis_release}%{?dist}
+Release: 18%{?dist}
 License: GPLv3
 Source0: http://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz
 Source1: which2.sh
@@ -14,22 +13,10 @@ Requires: coreutils
 BuildRequires: gcc
 BuildRequires: readline-devel
 
-Requires:       glibc
-Provides:       /usr/bin/which
-
 %description
 The which command shows the full pathname of a specified program, if
 the specified program is in your PATH.
 
-%package doc
-Summary: Documents for %{name}
-BuildArch: noarch
-Requires: %{name} = %{version}-%{release}
-
-
-%description  doc
-Doc pages for %{name}
-
 %prep
 %setup -q
 %patch0 -p1 -b .coverity
@@ -48,17 +35,15 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %files
 %license COPYING
+%doc EXAMPLES README AUTHORS NEWS
 %attr(0644,root,root) %{_sysconfdir}/profile.d/which2.*
 %{_bindir}/which
 %{_infodir}/which.info*
 %{_mandir}/man1/which.1*
 
-%files doc
-%doc EXAMPLES README AUTHORS NEWS
-
 %changelog
-* Fri Jul 15 2022 Chang Gao <taifu.gc@alibaba-inc.com> - 2.21-17.0.1
-- Add doc sub package
+* Mon Apr 11 2022 Than Ngo <than@redhat.com> - 2.21-18
+- Resolves: #2044450 - custom profile generates shell error
 
 * Thu Nov 25 2021 Than Ngo <than@redhat.com> - 2.21-17
 - Resolves: #2025709, check shell correctly 
diff --git a/which2.sh b/which2.sh
index 0f47f9e..bca5347 100644
--- a/which2.sh
+++ b/which2.sh
@@ -20,7 +20,7 @@ bash|sh)
     ;;
 esac
 
-which () {
+function which {
     (alias; eval ${which_declare}) | /usr/bin/which --tty-only --read-alias --read-functions --show-tilde --show-dot $@
 }
 
-- 
Gitee