summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@fedoraproject.org>2010-06-09 17:32:06 +0000
committerNalin Dahyabhai <nalin@fedoraproject.org>2010-06-09 17:32:06 +0000
commit2df01ea9912f966d828fc6503cfaf9954feeb4c4 (patch)
tree165da1bc01a139145db9e32809bd28369cd4b89d
parentf905e92cf831e12373c1c23dea2ea9c631cf45f9 (diff)
downloadkrb5-2df01ea9912f966d828fc6503cfaf9954feeb4c4.tar.gz
krb5-2df01ea9912f966d828fc6503cfaf9954feeb4c4.tar.xz
krb5-2df01ea9912f966d828fc6503cfaf9954feeb4c4.zip
- use the "pathmunge" function to add %%{krb5prefix}/bin to $PATH rather
than doing it the harder way ourselves (part of #544652)
-rwxr-xr-xkrb5.sh8
-rw-r--r--krb5.spec6
2 files changed, 7 insertions, 7 deletions
diff --git a/krb5.sh b/krb5.sh
index 760c0b3..5a19361 100755
--- a/krb5.sh
+++ b/krb5.sh
@@ -1,6 +1,2 @@
-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
+pathmunge /usr/kerberos/bin
+pathmunge /usr/kerberos/sbin
diff --git a/krb5.spec b/krb5.spec
index 09d91a9..eb74aac 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -10,7 +10,7 @@
Summary: The Kerberos network authentication system
Name: krb5
Version: 1.7.1
-Release: 10%{?dist}
+Release: 11%{?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
@@ -227,6 +227,10 @@ to obtain initial credentials from a KDC using a private key and a
certificate.
%changelog
+* Wed Jun 9 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7.1-11
+- use the "pathmunge" function to add %%{krb5prefix}/bin to $PATH rather
+ than doing it the harder way ourselves (part of #544652)
+
* Thu May 27 2010 Nalin Dahyabhai <nalin@redhat.com>
- ksu: move session management calls to before we drop privileges, like
su does (#596887), and don't skip the PAM account check for root or the