rpms/uw-imap/F-7 imap-2007-paths.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 uw-imap.spec, 1.33, 1.34 imap-2004d-optflags.patch, 1.1, NONE imap-2006-paths.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/uw-imap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19819/F-7

Modified Files:
	.cvsignore sources uw-imap.spec 
Added Files:
	imap-2007-paths.patch 
Removed Files:
	imap-2004d-optflags.patch imap-2006-paths.patch 
Log Message:
sync w/devel (for imap-2007a1)


imap-2007-paths.patch:

--- NEW FILE imap-2007-paths.patch ---
diff -up imap-2007/src/osdep/unix/Makefile.paths imap-2007/src/osdep/unix/Makefile
--- imap-2007/src/osdep/unix/Makefile.paths	2007-12-17 16:10:24.000000000 -0600
+++ imap-2007/src/osdep/unix/Makefile	2007-12-21 09:30:04.000000000 -0600
@@ -96,11 +96,11 @@ CHECKPW=std
 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
 MD5PWD=/etc/cram-md5.pwd
 # Tries one of the test alternatives below if not specified.
 LOCKPGM=


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/F-7/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	10 Nov 2007 02:47:48 -0000	1.12
+++ .cvsignore	21 Mar 2008 14:52:10 -0000	1.13
@@ -1 +1 @@
-imap-2006k.tar.Z
+imap-2007a1.tar.Z


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	10 Nov 2007 02:47:48 -0000	1.13
+++ sources	21 Mar 2008 14:52:10 -0000	1.14
@@ -1 +1 @@
-3a98066870fb8075c744079309e379c8  imap-2006k.tar.Z
+828a84c64ef933bfcc805b838576a774  imap-2007a1.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/uw-imap/F-7/uw-imap.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- uw-imap.spec	10 Nov 2007 02:47:48 -0000	1.33
+++ uw-imap.spec	21 Mar 2008 14:52:10 -0000	1.34
@@ -1,14 +1,19 @@
 
 # Fedora review: http://bugzilla.redhat.com/166008
 
-#define beta
+#define beta 1
 #define dev .DEV.SNAP-
 #define snap 0709171900
 
+# ship static lib, matches default upstream config
+# as convenience to users, since our hacked shlib can potentially break 
+# abi semi-often
+%define _with_static 1
+
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2006k
-Release: 1%{?dist}
+Version: 2007a1
+Release: 2%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: ASL 2.0 
@@ -20,11 +25,15 @@
 
 %define soname    c-client
 #define somajor   %{version} 
-%define somajor   2006
+%define somajor   2007
 %define shlibname lib%{soname}.so.%{somajor}
+%if 0%{?fedora} > 2 || 0%{?rhel} > 5
+%define imap_libs lib%{soname}
+%else
+# rhel (4,5) requires parallel-installable shlib, to not conflict with 
+# os-provided libc-client
 %define imap_libs lib%{soname}%{somajor}
-## Old naming
-#define imap_libs	lib%{soname}
+%endif
 
 # 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)
@@ -43,7 +52,7 @@
 Source34: ipop3-xinetd
 Source35: pop3s-xinetd
 
-Patch1: imap-2006-paths.patch
+Patch1: imap-2007-paths.patch
 # See http://bugzilla.redhat.com/229781 , http://bugzilla.redhat.com/127271
 Patch2: imap-2004a-doc.patch
 Patch5: imap-2001a-overflow.patch
@@ -72,9 +81,9 @@
 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}
+Obsoletes: libc-client2006 < 2006k-1
+%if "%{imap_libs}" != "libc-client2007"
+Obsoletes: libc-client2007 < 2007-2
 %endif
 %description -n %{imap_libs} 
 Provides a common API for accessing mailboxes. 
@@ -85,9 +94,11 @@
 Requires: %{imap_libs} = %{version}-%{release}
 # imap -> uw-imap rename
 Obsoletes: imap-devel < 1:%{version}
-%if 0%{?fedora} > 6
+%if "%{imap_libs}" == "libc-client"
 Obsoletes: libc-client-devel < %{version}-%{release}
 Provides:  libc-client-devel = %{version}-%{release}
+%else
+Conflicts: libc-client-devel < %{version}-%{release}
 %endif
 %description devel
 Contains the header files and libraries for developing programs 
@@ -97,9 +108,10 @@
 Summary: UW IMAP static library
 Group:   Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
+#Provides: libc-client-static = %{version}-%{release}
 Requires: krb5-devel openssl-devel pam-devel
 %description static 
-Contains static libraries for developing programs
+Contains static libraries for developing programs 
 which will use the UW C-client common API.
 
 %package utils
@@ -108,11 +120,18 @@
 # imap -> uw-imap rename
 Obsoletes: imap-utils < 1:%{version}
 %description utils
-This package contains some utilities for managing UW IMAP email.
+This package contains some utilities for managing UW IMAP email,including:
+* dmail : procmail Mail Delivery Module
+* mailutil : mail utility program
+* mtest : C client test program
+* tmail : Mail Delivery Module
+* mlock
+
 
 
 %prep
-%setup -q -n imap-%{version}%{?dev}%{?snap}
+#setup -q -n imap-%{version}%{?dev}%{?snap}
+%setup -q -n imap-2007a
 
 %patch1 -p1 -b .paths
 %patch2 -p1 -b .doc
@@ -178,8 +197,9 @@
 install -m644 ./c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}/imap/
 install -m644 ./src/osdep/tops-20/shortsym.h $RPM_BUILD_ROOT%{_includedir}/imap/
 
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8/
-install -p -m644 src/{ipopd/ipopd,imapd/imapd}.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+install -p -D -m644 src/imapd/imapd.8 $RPM_BUILD_ROOT%{_mandir}/man8/imapd.8uw
+install -p -D -m644 src/ipopd/ipopd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ipopd.8uw
+
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 install -p -m755 ipopd/ipop{2d,3d} $RPM_BUILD_ROOT%{_sbindir}/
 install -p -m755 imapd/imapd $RPM_BUILD_ROOT%{_sbindir}/
@@ -207,7 +227,7 @@
 touch $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
 
 
-# FIXME, do this on daemon startup -- Rex
+# FIXME -- Rex
 %post
 {
 cd %{sslcerts} &> /dev/null || :
@@ -289,6 +309,30 @@
 
 
 %changelog
+* Wed Mar 19 2008 Rex Dieter <rdieter at fedoraproject.org> 2007a1-2
+- uw-imap conflicts with cyrus-imapd (#222486)
+
+* Wed Mar 19 2008 Rex Dieter <rdieter at fedoraproject.org> 2007a1-1
+- imap-2007a1
+- include static lib
+- utils: update %%description
+
+* Thu Mar 13 2008 Rex Dieter <rdieter at fedoraproject.org> 2007a-1
+- imap-2007a
+
+* Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 2007-3 
+- respin (gcc43)
+
+* Wed Jan 23 2008 Rex Dieter <rdieter at fedoraproject.org> 2007-2
+- Obsoletes: libc-client2006 (#429796)
+- drop libc-client hacks for parallel-installability, fun while it lasted
+
+* Fri Dec 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2007-1
+- imap-2007
+
+* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006k-2
+- respin for new openssl
+
 * Fri Nov 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006k-1
 - imap-2006k (final)
 


--- imap-2004d-optflags.patch DELETED ---


--- imap-2006-paths.patch DELETED ---