From ca39d7360275d9e2be22ea892aa976a9ba4ed8a7 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Feb 02 2005 17:20:20 +0000
Subject: Merge post-1.9.14-0.fdr.1 changes from Rex.


---

diff --git a/gnupg-1.9.14.tar.bz2.sig b/gnupg-1.9.14.tar.bz2.sig
deleted file mode 100644
index 2cb22ba..0000000
Binary files a/gnupg-1.9.14.tar.bz2.sig and /dev/null differ
diff --git a/gnupg-1.9.15.tar.bz2.sig b/gnupg-1.9.15.tar.bz2.sig
new file mode 100644
index 0000000..dd1cb77
Binary files /dev/null and b/gnupg-1.9.15.tar.bz2.sig differ
diff --git a/gnupg-1.9.4-gpg-error.patch b/gnupg-1.9.4-gpg-error.patch
deleted file mode 100644
index 9542eec..0000000
--- a/gnupg-1.9.4-gpg-error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnupg-1.9.14/agent/preset-passphrase.c.gpg-err	2004-12-21 12:56:09.000000000 -0600
-+++ gnupg-1.9.14/agent/preset-passphrase.c	2005-01-06 14:27:28.000000000 -0600
-@@ -137,7 +137,7 @@
-     case SPWQ_IO_ERROR:
-       return gpg_error_from_errno (EIO);
-     case SPWQ_PROTOCOL_ERROR:
--      return gpg_error (GPG_ERR_PROTOCOL_VIOLATION);
-+      return gpg_error (GPG_ERR_UNSUPPORTED_PROTOCOL);
-     case SPWQ_ERR_RESPONSE:
-       return gpg_error (GPG_ERR_INV_RESPONSE);
-     case SPWQ_NO_AGENT:
diff --git a/gnupg2.spec b/gnupg2.spec
index a28968d..3f345a8 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -3,17 +3,15 @@
 Summary: GNU utility for secure communication and data storage
 Name:	 gnupg2 
 Epoch:	 0 
-Version: 1.9.14
+Version: 1.9.15
 Release: 1%{?dist_tag}
 License: GPL
 Group: 	 Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-1.9.14.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-1.9.14.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
 URL:	 http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Patch1: gnupg-1.9.4-gpg-error.patch
-
 Obsoletes: newpg < 0:0.9.5
 
 Requires(post): /sbin/install-info
@@ -26,18 +24,22 @@ BuildRequires: gcc
 %define pie 1
 %endif
 
-BuildRequires: openldap-devel, zlib-devel, gettext
 BuildRequires: libgcrypt-devel => 0:1.2.0
-BuildRequires: libgpg-error-devel => 0:0.7
+BuildRequires: libgpg-error-devel => 1.0
+Requires: libgpg-error >= 1.0
 BuildRequires: libassuan-devel >= 0.6.9
 BuildRequires: libksba-devel >= 0:0.9.7
 # to build without opensc support: --without opensc
 %{!?_without_opensc:BuildRequires: opensc-devel >= 0.9}
+%{!?_without_opensc:BuildRequires: pcsc-lite-devel }
 %{?_without_opensc:BuildConflicts: opensc-devel }
 
+BuildRequires: gettext
+BuildRequires: openldap-devel
 BuildRequires: libusb-devel
 BuildRequires: pth-devel
-BuildRequires: zlib-devel, bzip2-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
 Buildrequires: libusb-devel
 BuildRequires: docbook-utils
 
@@ -62,8 +64,6 @@ helpful when using the standard gpg versions (1.2.x or 1.3.x).
 %prep
 %setup -q -n gnupg-%{version}
 
-%patch1 -p1 -b .gpg-error
-
 
 %build
 
@@ -75,6 +75,7 @@ helpful when using the standard gpg versions (1.2.x or 1.3.x).
   --disable-rpath 
 
 make %{?_smp_mflags}
+
 make check
 
 
@@ -123,9 +124,15 @@ fi
 
 
 %changelog
-* Tue Feb  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.9.14-1
+* Tue Feb  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.9.15-1
 - Make install-info in scriptlets less noisy.
 
+* Tue Jan 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.15-0.fdr.1
+- 1.9.15
+
+* Fri Jan 07 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.14-0.fdr.2
+- note patch/hack to build against older ( <1.0) libgpg-error-devel
+
 * Thu Jan 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.14-0.fdr.1
 - 1.9.14
 - enable opensc support
diff --git a/sources b/sources
index ec03914..93c3f31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd121b7d368cf27928bfa4ef4e4cc982  gnupg-1.9.14.tar.bz2
+7b1d0562b66b1853b77d511feb786629  gnupg-1.9.15.tar.bz2