[krb5/f12/master] Revert "- use the "pathmunge" function to add %%{krb5prefix}/bin to $PATH rather"

[Nalin Dahyabhai]

commit c3a600ba15e90ee9075c4522ff629e3f3f898abf
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Mon Sep 13 10:58:10 2010 -0400

    Revert "- use the "pathmunge" function to add %%{krb5prefix}/bin to $PATH rather"
    
    This reverts commit 6faa01773e87301d5e8db21c0b0a82d6040cbda3.
    
    Conflicts:
    
    	krb5.spec

 krb5.sh   |    8 ++++++--
 krb5.spec |    6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/krb5.sh b/krb5.sh
index 5a19361..760c0b3 100755
--- a/krb5.sh
+++ b/krb5.sh
@@ -1,2 +1,6 @@
-pathmunge /usr/kerberos/bin
-pathmunge /usr/kerberos/sbin
+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
diff --git a/krb5.spec b/krb5.spec
index 7161bca..e9ecf3d 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7.1-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -228,6 +228,10 @@ to obtain initial credentials from a KDC using a private key and a
 certificate.
 
 %changelog
+* Mon Sep 13 2010 Nalin Dahyabhai <nalin at redhat.com> 1.7.1-14
+- revert pathmunge-related changes because pathmunge() isn't always there
+  if we've upgraded or anything weird's happened (#633212)
+
 * Wed Aug 24 2010 Nalin Dahyabhai <nalin at redhat.com> 1.7.1-13
 - adjust the last patch to apply properly to 1.7.1