From 8575867391a812ad4efff13b3773e8a12f6c399a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Oct 05 2006 12:04:36 +0000
Subject: * Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4

- eek, pam.d/xinet.d bits were all mixed up, fixed.

---

diff --git a/imap-2006-mixproto.patch b/imap-2006-mixproto.patch
deleted file mode 100644
index dfb68ed..0000000
--- a/imap-2006-mixproto.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- imap-2004c1/src/osdep/unix/Makefile.mbxproto	2005-04-28 12:44:53.000000000 -0500
-+++ imap-2004c1/src/osdep/unix/Makefile	2005-04-28 12:59:29.000000000 -0500
-@@ -91,7 +91,7 @@
- # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these
- # formats can never be empty files.
- 
--CREATEPROTO=unixproto
-+CREATEPROTO=mixproto
- EMPTYPROTO=unixproto
- 
- 
diff --git a/uw-imap.spec b/uw-imap.spec
index f6a73c2..0a806e1 100644
--- a/uw-imap.spec
+++ b/uw-imap.spec
@@ -2,7 +2,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -28,18 +28,17 @@ Obsoletes: imap < 1:%{version}
 
 Source10: c-client.cf
 
-# legacy/old pam setup, using pam_stack.so
-Source21: imap-legacy.pam
 # new pam setup, using new "include" feature
-Source22: imap.pam
+Source21: imap.pam
+# legacy/old pam setup, using pam_stack.so
+Source22: imap-legacy.pam
 
 Source31: imap-xinetd
-Source32: ipop2-xinetd
-Source33: ipop3-xinetd
-Source34: imaps-xinetd
+Source32: imaps-xinetd
+Source33: ipop2-xinetd
+Source34: ipop3-xinetd
 Source35: pop3s-xinetd
 
-
 Patch1: imap-2006-paths.patch
 Patch5: imap-2001a-overflow.patch
 Patch7: imap-2002d-ssltype.patch
@@ -274,6 +273,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
+- eek, pam.d/xinet.d bits were all mixed up, fixed.
+
 * Wed Oct 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-3
 - libc-client: move c-client.cf here
 - c-client.cf: +set new-folder-format same-as-inbox