rpms/uw-imap/devel imap-2006-mixproto.patch, NONE, 1.1 imap-2006-paths.patch, NONE, 1.1 sources, 1.2, 1.3 uw-imap.spec, 1.10, 1.11 imap-2004-paths.patch, 1.1, NONE imap-2004c1-mbxproto.patch, 1.1, NONE

Thu Sep 21 15:45:41 UTC 2006

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8432

Modified Files:
	sources uw-imap.spec 
Added Files:
	imap-2006-mixproto.patch imap-2006-paths.patch 
Removed Files:
	imap-2004-paths.patch imap-2004c1-mbxproto.patch 
Log Message:
* Fri Sep 15 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006-1
- imap-2006
- change default (CREATEPROTO) driver to mix
- Obsolete old libc-clients


imap-2006-mixproto.patch:

--- NEW FILE imap-2006-mixproto.patch ---
--- 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
 
 

imap-2006-paths.patch:

--- NEW FILE imap-2006-paths.patch ---
--- imap-2006/src/osdep/unix/Makefile.paths	2006-08-30 20:31:57.000000000 -0500
+++ imap-2006/src/osdep/unix/Makefile	2006-09-15 08:34:25.000000000 -0500
@@ -96,11 +96,11 @@
 LOGINPW=std
 SIGTYPE=bsd
 CRXTYPE=std
-ACTIVEFILE=/usr/lib/news/active
-SPOOLDIR=/usr/spool
+ACTIVEFILE=/var/lib/news/active
+SPOOLDIR=/var/spool
 MAILSPOOL=$(SPOOLDIR)/mail
 NEWSSPOOL=$(SPOOLDIR)/news
-RSHPATH=/usr/ucb/rsh
+RSHPATH=/usr/bin/rsh
 LOCKPGM=/etc/mlock
 MD5PWD="/etc/cram-md5.pwd"
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Sep 2005 20:26:23 -0000	1.2
+++ sources	21 Sep 2006 15:45:41 -0000	1.3
@@ -1 +0,0 @@
-9a80f58d8d6a0979c13714ae69050020  imap-2004g.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- uw-imap.spec	29 Aug 2006 18:16:19 -0000	1.10
+++ uw-imap.spec	21 Sep 2006 15:45:41 -0000	1.11
@@ -5,14 +5,14 @@
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2004g
-Release: 6%{?dist}
+Version: 2006
+Release: 1%{?dist}
 
 License: University of Washington Free-Fork License
 Group: 	 System Environment/Daemons
 URL:	 http://www.washington.edu/imap/
 # Old (non-latest) releases live at  ftp://ftp.cac.washington.edu/imap/old/
-Source:	 ftp://ftp.cac.washington.edu/imap/imap-2004g.tar.Z
+Source:	 ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.Z
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define soname    c-client
@@ -38,13 +38,12 @@
 Source6: imaps-xinetd
 Source7: pop3s-xinetd
 
-Patch1: imap-2004-paths.patch
-Patch2: imap-2004d-optflags.patch
+Patch1: imap-2006-paths.patch
 Patch5: imap-2001a-overflow.patch
 Patch7: imap-2002d-ssltype.patch
 Patch9: imap-2002e-shared.patch
 Patch10: imap-2002e-authmd5.patch
-Patch11: imap-2004c1-mbxproto.patch
+Patch11: imap-2006-mixproto.patch
 
 BuildRequires: krb5-devel
 BuildRequires: openssl-devel
@@ -66,6 +65,8 @@
 %package -n %{imap_libs} 
 Summary: UW C-client mail library 
 Group:	 System Environment/Libraries
+Obsoletes: libc-client2004d < 1:2004d-2
+Obsoletes: libc-client2004e < 2004e-2
 %description -n %{imap_libs} 
 Provides a common API for accessing mailboxes. 
 
@@ -93,7 +94,6 @@
 %setup -q -n imap-%{version}
 
 %patch1 -p1 -b .paths
-%patch2 -p1 -b .optflags
 
 %patch5 -p1 -b .overflow
 
@@ -101,11 +101,11 @@
 
 %patch9 -p1 -b .shared
 %patch10 -p1 -b .authmd5
-# use mbx (instead of unix/mbox) folder format by default
+# use mix (instead of unix/mbox) folder format by default
 # its faster, allows (better) locking
-%patch11 -p1 -b .mbxproto
+%patch11 -p1 -b .mixproto
 
-%if "%{?fedora}" > "4"
+%if "%{?fedora}" > "4" || "%{?rhel}" > "5"
 install -p -m644 %{SOURCE2} imap.pam
 %else
 install -p -m644 %{SOURCE1} imap.pam
@@ -113,10 +113,10 @@
 
 
 %build
-# Not sure why this is included, omitting for now -- Rex
+# Not sure why this was ever included, omitting for now -- Rex
 #EXTRACFLAGS="$EXTRACFLAGS -DDISABLE_POP_PROXY=1"
 
-# Kerberos setup (proabably legacy-only -- Rex)
+# Kerberos setup
 if [ -x %{_sysconfdir}/profile.d/krb5.sh ]; then
   . %{_sysconfdir}/profile.d/krb5.sh
 elif ! echo ${PATH} | grep -q %{_prefix}kerberos/bin ; then
@@ -124,7 +124,8 @@
 fi
 GSSDIR=$(krb5-config --prefix)
 
-# SSL setup (probably legacy-only -- Rex)
+## SSL setup
+# (probably legacy-only) -- Rex
 export EXTRACFLAGS="$EXTRACFLAGS $(pkg-config --cflags openssl 2>/dev/null)"
 
 make %{?_smp_mflags} lnp \
@@ -271,6 +272,11 @@
 
 
 %changelog
+* Fri Sep 15 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006-1
+- imap-2006
+- change default (CREATEPROTO) driver to mix
+- Obsolete old libc-clients
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2004g-6 
 - fc6 respin
 


--- imap-2004-paths.patch DELETED ---


--- imap-2004c1-mbxproto.patch DELETED ---


