[krb5-appl/f14/master] - revert pathmunge-related changes because pathmunge() isn't always there if we've upgraded or anyth

[Nalin Dahyabhai]

commit 2a0a6eb5789702a351b112587743995336ff49c9
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Mon Sep 13 11:01:04 2010 -0400

    - revert pathmunge-related changes because pathmunge() isn't always there if we've upgraded or anything weird's happened (#633212)

 krb5-appl.spec |    6 +++++-
 krb5.sh        |    7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/krb5-appl.spec b/krb5-appl.spec
index 8ea4c41..99df8bb 100644
--- a/krb5-appl.spec
+++ b/krb5-appl.spec
@@ -10,7 +10,7 @@
 Summary: Kerberos-aware versions of telnet, ftp, rsh, and rlogin
 Name: krb5-appl
 Version: 1.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5-appl/1.0/krb5-appl-1.0.1-signed.tar
 Source0: krb5-appl-%{version}.tar.gz
@@ -251,6 +251,10 @@ exit 0
 %{krb5prefix}/man/man8/telnetd.8*
 
 %changelog
+* Mon Sep 13 2010 Nalin Dahyabhai <nalin at redhat.com> - 1.0.1-3
+- revert pathmunge-related changes because pathmunge() isn't always there
+  if we've upgraded or anything weird's happened (#633212)
+
 * Wed Jun  9 2010 Nalin Dahyabhai <nalin at redhat.com> - 1.0.1-2
 - use the "pathmunge" function to add %%{krb5prefix}/bin to $PATH rather
   than doing it the harder way ourselves (part of #544652)
diff --git a/krb5.sh b/krb5.sh
index ada4d1c..760c0b3 100644
--- a/krb5.sh
+++ b/krb5.sh
@@ -1 +1,6 @@
-pathmunge /usr/kerberos/bin
+if ! echo ${PATH} | /bin/grep -q /usr/kerberos/bin ; then
+	PATH=/usr/kerberos/bin:${PATH}
+fi
+if ! echo ${PATH} | /bin/grep -q /usr/kerberos/sbin ; then
+	PATH=/usr/kerberos/sbin:${PATH}
+fi