From f5a74383e57a8d87536244406a99d28f18d8c0de Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Dec 22 2004 22:41:06 +0000
Subject: - update to 1.4.0


---

diff --git a/.cvsignore b/.cvsignore
index 7388dd7..aac0aa4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-gnupg-1.2.6.tar.bz2
+gnupg-1.4.0.tar.bz2
+gnupg-1.4.0.tar.bz2.sig
diff --git a/gnupg.spec b/gnupg.spec
index 28f69ca..ebf8a48 100644
--- a/gnupg.spec
+++ b/gnupg.spec
@@ -1,7 +1,7 @@
 Summary: A GNU utility for secure communication and data storage.
 Name: gnupg
-Version: 1.2.6
-Release: 2
+Version: 1.4.0
+Release: 1
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
@@ -9,7 +9,8 @@ Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 Source2: gnupg-shm-coprocessing.expect
 Source3: 57548DCD.gpg
 URL: http://www.gnupg.org/
-BuildPrereq: autoconf, expect
+BuildPrereq: bzip2-devel, expect, libusb-devel, ncurses-devel
+BuildPrereq: openldap-devel, readline-devel, zlib-devel
 Provides: gpg, openpgp
 Prereq: /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -33,9 +34,13 @@ configure_flags=--disable-asm
 %endif
 CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS
 LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAGS
-
-%configure --disable-rpath --libexecdir=%{_libdir} --with-zlib $configure_flags
-
+# Work around a configure bug which will be fixed in 1.4.1.
+LIBS="$LIBS -lncurses"; export LIBS
+%configure \
+	--disable-rpath \
+	--libexecdir=%{_libdir} \
+	--with-zlib --with-bzip2 --with-readline \
+	$configure_flags
 make %{?_smp_mflags}
 make check
 env LANG=C expect -f $RPM_SOURCE_DIR/gnupg-shm-coprocessing.expect
@@ -77,6 +82,12 @@ fi
 %{_mandir}/man7/*
 
 %changelog
+* Wed Dec 22 2004 Nalin Dahyabhai <nalin@redhat.com> 1.4.0-1
+- update to 1.4.0
+
+* Mon Nov  1 2004 Nalin Dahyabhai <nalin@redhat.com>
+- add a pile of buildprereq
+
 * Mon Nov  1 2004 Robert Scheck <redhat@linuxnetz.de> 1.2.6-2
 - set LANG=C before running shm coprocessing build-time check (#129873)
 
diff --git a/sources b/sources
index 766b736..13795a5 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-b1890f5dfacd2ba7ab15448c5ff08a4e  gnupg-1.2.6.tar.bz2
+8c303606aaf73b7756b9fe6f3d8b58c2  gnupg-1.4.0.tar.bz2
+bdfb7093cf5d76d1b69e9b577e9d8514  gnupg-1.4.0.tar.bz2.sig