rpms/uw-imap/EL-4 imap-2004a-doc.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 uw-imap.spec, 1.24, 1.25

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/uw-imap/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28976

Modified Files:
	.cvsignore sources uw-imap.spec 
Added Files:
	imap-2004a-doc.patch 
Log Message:
* Fri Nov 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006k-1
- imap-2006k (final)


imap-2004a-doc.patch:

--- NEW FILE imap-2004a-doc.patch ---
Patch by Robert Scheck <redhat at linuxnetz.de> for uw-imap >= 2004a, which corrects
paths to imapd, ipop2d and ipop3d in the man pages. 

This patch is based on Red Hat Bugzilla ID #127271 and solves ID #229781.

--- imap-2004a/src/imapd/imapd.8		2004-05-18 19:46:54.000000000 +0200
+++ imap-2004a/src/imapd/imapd.8.doc		2004-07-23 15:24:17.000000000 +0200
@@ -3,7 +3,7 @@
 .SH NAME
 IMAPd \- Internet Message Access Protocol server
 .SH SYNOPSIS
-.B /usr/etc/imapd
+.B /usr/sbin/imapd
 .SH DESCRIPTION
 .I imapd
 is a server which supports the
--- imap-2004a/src/ipopd/ipopd.8		2004-05-18 19:50:05.000000000 +0200
+++ imap-2004a/src/ipopd/ipopd.8.doc		2004-07-23 15:23:38.000000000 +0200
@@ -3,9 +3,9 @@
 .SH NAME
 IPOPd \- Post Office Protocol server
 .SH SYNOPSIS
-.B /usr/etc/ipop2d
+.B /usr/sbin/ipop2d
 .PP
-.B /usr/etc/ipop3d
+.B /usr/sbin/ipop3d
 .SH DESCRIPTION
 .I ipop2d
 and


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/EL-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Apr 2007 16:43:32 -0000	1.8
+++ .cvsignore	10 Nov 2007 02:49:53 -0000	1.9
@@ -1 +1 @@
-imap-2006g.tar.Z
+imap-2006k.tar.Z


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	3 Apr 2007 16:43:32 -0000	1.9
+++ sources	10 Nov 2007 02:49:53 -0000	1.10
@@ -1 +1 @@
-675dc805e9c5bd77c07f5554f29a24ec  imap-2006g.tar.Z
+3a98066870fb8075c744079309e379c8  imap-2006k.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/EL-4/uw-imap.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- uw-imap.spec	3 Apr 2007 16:55:00 -0000	1.24
+++ uw-imap.spec	10 Nov 2007 02:49:53 -0000	1.25
@@ -1,20 +1,21 @@
 
 # Fedora review: http://bugzilla.redhat.com/166008
 
-#define snap 0701181849
-#define beta .DEV.SNAP-%{snap}
+#define beta
+#define dev .DEV.SNAP-
+#define snap 0709171900
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2006g
-Release: 2%{?dist}.1
+Version: 2006k
+Release: 1%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
-License: Apache 2.0 
+License: ASL 2.0 
 Group: 	 System Environment/Daemons
 URL:	 http://www.washington.edu/imap/
 # Old (non-latest) releases live at  ftp://ftp.cac.washington.edu/imap/old/
-Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}%{?beta}.tar.Z
+Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}%{?beta}%{?dev}%{?snap}.tar.Z
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define soname    c-client
@@ -24,7 +25,6 @@
 %define imap_libs lib%{soname}%{somajor}
 ## Old naming
 #define imap_libs	lib%{soname}
-#define imap_libs	imap-libs
 
 # FC4+ uses %%_sysconfdir/pki/tls/certs, previous releases used %%_datadir/ssl/certs
 %global sslcerts  %(if [ -d %{_sysconfdir}/pki/tls/certs ]; then echo "%{_sysconfdir}/pki/tls/certs"; else echo "%{_datadir}/ssl/certs"; fi)
@@ -44,6 +44,8 @@
 Source35: pop3s-xinetd
 
 Patch1: imap-2006-paths.patch
+# See http://bugzilla.redhat.com/229781 , http://bugzilla.redhat.com/127271
+Patch2: imap-2004a-doc.patch
 Patch5: imap-2001a-overflow.patch
 Patch9: imap-2002e-shared.patch
 Patch10: imap-2002e-authmd5.patch
@@ -70,6 +72,10 @@
 Obsoletes: libc-client2004d < 1:2004d-2
 Obsoletes: libc-client2004e < 2004e-2
 Obsoletes: libc-client2004g < 2004g-7
+%if 0%{?fedora} > 6
+# not strictly needed, but cleaner uprade path
+Obsoletes: libc-client < %{version}-%{release}
+%endif
 %description -n %{imap_libs} 
 Provides a common API for accessing mailboxes. 
 
@@ -79,8 +85,10 @@
 Requires: %{imap_libs} = %{version}-%{release}
 # imap -> uw-imap rename
 Obsoletes: imap-devel < 1:%{version}
-# Until F7 merger anyway
-Conflicts: libc-client-devel
+%if 0%{?fedora} > 6
+Obsoletes: libc-client-devel < %{version}-%{release}
+Provides:  libc-client-devel = %{version}-%{release}
+%endif
 %description devel
 Contains the header files and libraries for developing programs 
 which will use the UW C-client common API.
@@ -104,9 +112,10 @@
 
 
 %prep
-%setup -q -n imap-%{version}%{?beta}
+%setup -q -n imap-%{version}%{?dev}%{?snap}
 
 %patch1 -p1 -b .paths
+%patch2 -p1 -b .doc
 
 %patch5 -p1 -b .overflow
 
@@ -280,6 +289,31 @@
 
 
 %changelog
+* Fri Nov 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006k-1
+- imap-2006k (final)
+
+* Wed Sep 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006k-0.1.0709171900
+- imap-2006k.DEV.SNAP-0709171900
+
+* Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 2006j-3
+- fix License
+
+* Tue Jul 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006j-2
+- imap-2006j2
+
+* Mon Jul 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006j-1
+- imap-2006j1
+
+* Wed Jun 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006i-1
+- imap-2006i
+
+* Wed May 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006h-1
+- imap-2006h
+- Obsolete pre-merge libc-client pkgs
+
+* Fri Apr 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006g-3
+- imap-2004a-doc.patch (#229781,#127271)
+
 * Mon Apr  2 2007 Joe Orton <jorton at redhat.com> 2006g-2
 - use $RPM_OPT_FLAGS during build