From 9a31789f24c78c720d79a5d8ab0098e3be54b554 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Fri, 22 Jan 2010 15:08:24 +0000
Subject: [PATCH] - use portreserve correctly -- portrelease takes the basename
 of the file     whose entries should be released, so we need three files, not
 one

---
 kerberos-adm.portreserve |  1 +
 kerberos-iv.portreserve  |  1 +
 krb5.portreserve         |  3 ---
 krb5.spec                | 18 ++++++++++++++----
 krb5_prop.portreserve    |  1 +
 5 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 kerberos-adm.portreserve
 create mode 100644 kerberos-iv.portreserve
 delete mode 100644 krb5.portreserve
 create mode 100644 krb5_prop.portreserve

diff --git a/kerberos-adm.portreserve b/kerberos-adm.portreserve
new file mode 100644
index 0000000..eb6080d
--- /dev/null
+++ b/kerberos-adm.portreserve
@@ -0,0 +1 @@
+kerberos-adm/tcp
diff --git a/kerberos-iv.portreserve b/kerberos-iv.portreserve
new file mode 100644
index 0000000..e3e870d
--- /dev/null
+++ b/kerberos-iv.portreserve
@@ -0,0 +1 @@
+kerberos-iv
diff --git a/krb5.portreserve b/krb5.portreserve
deleted file mode 100644
index 8e1e0d7..0000000
--- a/krb5.portreserve
+++ /dev/null
@@ -1,3 +0,0 @@
-kerberos-adm/tcp
-kerberos-iv
-krb5_prop/tcp
diff --git a/krb5.spec b/krb5.spec
index 446d77e..65bb0e4 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 21%{?dist}
+Release: 22%{?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-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -42,7 +42,9 @@ Source26: gssftp.pamd
 Source27: kshell.pamd
 Source28: ekshell.pamd
 Source29: ksu.pamd
-Source30: krb5.portreserve
+Source30: kerberos-iv.portreserve
+Source31: kerberos-adm.portreserve
+Source32: krb5_prop.portreserve
 
 Patch3: krb5-1.3-netkit-rsh.patch
 Patch4: krb5-1.3-rlogind-environ.patch
@@ -224,6 +226,10 @@ to obtain initial credentials from a KDC using a private key and a
 certificate.
 
 %changelog
+* Fri Jan 22 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-22
+- use portreserve correctly -- portrelease takes the basename of the file
+  whose entries should be released, so we need three files, not one
+
 * Mon Jan 18 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-21
 - suppress warnings of impending password expiration if expiration is more than
   seven days away when the KDC reports it via the last-req field, just as we
@@ -1706,7 +1712,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 install -pm 644 $RPM_SOURCE_DIR/krb5kdc.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/krb5kdc
 install -pm 644 $RPM_SOURCE_DIR/kadmin.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/kadmin
 mkdir -p $RPM_BUILD_ROOT/etc/portreserve
-install -pm 644 $RPM_SOURCE_DIR/krb5.portreserve $RPM_BUILD_ROOT/etc/portreserve/krb5
+install -pm 644 $RPM_SOURCE_DIR/kerberos-iv.portreserve $RPM_BUILD_ROOT/etc/portreserve/kerberos-iv
+install -pm 644 $RPM_SOURCE_DIR/kerberos-adm.portreserve $RPM_BUILD_ROOT/etc/portreserve/kerberos-adm
+install -pm 644 $RPM_SOURCE_DIR/krb5_prop.portreserve $RPM_BUILD_ROOT/etc/portreserve/krb5_prop
 
 # Xinetd configuration files.
 mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d/
@@ -1975,7 +1983,9 @@ exit 0
 /etc/rc.d/init.d/kprop
 %config(noreplace) /etc/sysconfig/krb5kdc
 %config(noreplace) /etc/sysconfig/kadmin
-%config(noreplace) /etc/portreserve/krb5
+%config(noreplace) /etc/portreserve/kerberos-iv
+%config(noreplace) /etc/portreserve/kerberos-adm
+%config(noreplace) /etc/portreserve/krb5_prop
 
 %doc doc/admin*.ps.gz
 %doc doc/install*.ps.gz
diff --git a/krb5_prop.portreserve b/krb5_prop.portreserve
new file mode 100644
index 0000000..54eeff2
--- /dev/null
+++ b/krb5_prop.portreserve
@@ -0,0 +1 @@
+krb5_prop/tcp