From 3ac2a3382a32b1d35bd4ed78f3fa33bb1af8ecfb Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@fedoraproject.org>
Date: Fri, 2 Dec 2005 17:06:47 +0000
Subject: [PATCH] - Update to fetchmail-6.3.0 - Remove nohesiod and nokerberos
 conditionals

---
 .cvsignore     |  4 ++--
 fetchmail.spec | 25 ++++++++++++-------------
 sources        |  4 ++--
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 90e380d..95ef0ce 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-fetchmail-6.2.9-rc10.tar.bz2
-fetchmail-6.2.9-rc10.tar.bz2.asc
+fetchmail-6.3.0.tar.bz2
+fetchmail-6.3.0.tar.bz2.asc
diff --git a/fetchmail.spec b/fetchmail.spec
index 3d569d2..9057b0b 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -3,19 +3,17 @@
 
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
-Version: 6.2.9
-Release: 0.1.rc10
+Version: 6.3.0
+Release: 1
 Requires: smtpdaemon
-Source0: http://download.berlios.de/fetchmail/fetchmail-6.2.9-rc10.tar.bz2
-Source1: http://download.berlios.de/fetchmail/fetchmail-6.2.9-rc10.tar.bz2.asc
+Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
+Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
 Patch0: fetchmail-6.2.5-addrconf.patch
 URL: http://fetchmail.berlios.de/
 License: GPL
 Group: Applications/Internet
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: openssl-devel gettext-devel
-%{!?nohesiod:BuildRequires: hesiod-devel}
-%{!?nokerberos:BuildRequires: krb5-devel}
+BuildRequires: gettext-devel hesiod-devel krb5-devel openssl-devel
 %if ! %{fetchmailconf}
 Obsoletes: fetchmailconf
 %endif
@@ -46,16 +44,13 @@ Install fetchmailconf if you need help configuring fetchmail. You'll
 need to have Python and Tk installed in order to use fetchmailconf.
 
 %prep
-%setup -q -n fetchmail-6.2.9-rc10
+%setup -q
 %patch0 -p1 -b .addrconf
 
 %build
-%configure --enable-POP3 --enable-IMAP --with-ssl \
-	%{!?nohesiod:--with-hesiod} \
+%configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
 	--enable-ETRN --enable-NTLM --enable-SDPS --enable-RPA \
-	--enable-nls \
-%{?nokerberos:--without-kerberos --without-kerberos5 --without-kerberos --without-gssapi} \
-%{!?nokerberos:--with-kerberos --with-kerberos5 --with-kerberos --with-gssapi}
+	--enable-nls --with-kerberos --with-kerberos5 --with-gssapi
 make
 
 %install
@@ -88,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Dec  2 2005 Miloslav Trmac <mitr@redhat.com> - 6.3.0-1
+- Update to fetchmail-6.3.0
+- Remove nohesiod and nokerberos conditionals
+
 * Wed Nov 30 2005 Miloslav Trmac <mitr@redhat.com> - 6.2.9-0.1.rc10
 - Update to fetchmail-6.2.9-rc10
 
diff --git a/sources b/sources
index 84eaa0f..7076eb5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-92ee5104bd0709e361b97b3a33183176  fetchmail-6.2.9-rc10.tar.bz2
-5ff62f1f443450da428ff3f0fab0d695  fetchmail-6.2.9-rc10.tar.bz2.asc
+b547b59f352af956911ce812773b3976  fetchmail-6.3.0.tar.bz2
+16c5d43242cd4941be265d7556b62393  fetchmail-6.3.0.tar.bz2.asc