rpms/uw-imap/FC-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 uw-imap.spec, 1.15, 1.16

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14528

Modified Files:
	.cvsignore sources uw-imap.spec 
Log Message:
* Fri Jan 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006e-2
- use /etc/profile.d/krb5-devel.sh

* Fri Jan 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006e-1
- imap-2006e



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Oct 2006 19:36:15 -0000	1.5
+++ .cvsignore	30 Jan 2007 19:05:05 -0000	1.6
@@ -1,3 +1,6 @@
 imap-2006.tar.Z
 imap-2006a.tar.Z
 imap-2006b.tar.Z
+imap-2006c1.tar.Z
+imap-2006d.tar.Z
+imap-2006e.tar.Z


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Oct 2006 19:36:15 -0000	1.5
+++ sources	30 Jan 2007 19:05:05 -0000	1.6
@@ -1 +1 @@
-6ba2c67118b7432d91999bcb5b227288  imap-2006b.tar.Z
+a183c975a00198b0f5668ae311254aca  imap-2006e.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/FC-5/uw-imap.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- uw-imap.spec	6 Oct 2006 19:36:15 -0000	1.15
+++ uw-imap.spec	30 Jan 2007 19:05:05 -0000	1.16
@@ -1,15 +1,18 @@
 
+#define snap 0701181849
+#define beta .DEV.SNAP-%{snap}
+
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2006b
-Release: 1%{?dist}
+Version: 2006e
+Release: 2%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 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}.tar.Z
+Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}%{?beta}.tar.Z
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define soname    c-client
@@ -41,7 +44,6 @@
 
 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
 
@@ -75,6 +77,7 @@
 Requires: %{imap_libs} = %{version}-%{release}
 # imap -> uw-imap rename
 Obsoletes: imap-devel < 1:%{version}
+# Until F7 merger anyway
 Conflicts: libc-client-devel
 %description devel
 Contains the header files and libraries for developing programs 
@@ -99,18 +102,16 @@
 
 
 %prep
-%setup -q -n imap-%{version}
+%setup -q -n imap-%{version}%{?beta}
 
 %patch1 -p1 -b .paths
 
 %patch5 -p1 -b .overflow
 
-%patch7 -p1 -b .ssltype
-
 %patch9 -p1 -b .shared
 %patch10 -p1 -b .authmd5
 
-%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 install -p -m644 %{SOURCE21} imap.pam
 %else
 install -p -m644 %{SOURCE22} imap.pam
@@ -118,21 +119,17 @@
 
 
 %build
-# Not sure why this was ever included, omitting for now -- Rex
-#EXTRACFLAGS="$EXTRACFLAGS -DDISABLE_POP_PROXY=1"
 
 # Kerberos setup
-if [ -x %{_sysconfdir}/profile.d/krb5.sh ]; then
-  . %{_sysconfdir}/profile.d/krb5.sh
-elif ! echo ${PATH} | grep -q %{_prefix}kerberos/bin ; then
-  export PATH=%{_prefix}/kerberos/bin:${PATH}
-fi
+test -f %{_sysconfdir}/profile.d/krb5-devel.sh && source %{_sysconfdir}/profile.d/krb5-devel.sh
+test -f %{_sysconfdir}/profile.d/krb5.sh && source %{_sysconfdir}/profile.d/krb5.sh
 GSSDIR=$(krb5-config --prefix)
 
 ## SSL setup
-# (probably legacy-only) -- Rex
+# probably legacy-only, but shouldn't hurt -- Rex
 export EXTRACFLAGS="$EXTRACFLAGS $(pkg-config --cflags openssl 2>/dev/null)"
 
+echo "y" | \
 make %{?_smp_mflags} lnp \
 EXTRACFLAGS="$EXTRACFLAGS" \
 EXTRALDFLAGS="$EXTRALDFLAGS" \
@@ -274,6 +271,18 @@
 
 
 %changelog
+* Fri Jan 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006e-2
+- use /etc/profile.d/krb5-devel.sh
+
+* Fri Jan 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006e-1
+- imap-2006e
+
+* Mon Dec 18 2006 Rex Dieter <rdieter[AT]fedoraproject.org> 2006d-1
+- imap-2006d (#220121)
+
+* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006c1-1
+- imap-2006c1
+
 * Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006b-1
 - imap-2006b
 - %%ghost %%config(missingok,noreplace) %%{_sysconfdir}/c-client.cf