From 74a2005f4535ab3ebf346ed567f6494f924da066 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Jul 22 2008 19:55:31 +0000
Subject: - describe license as actually GPLv3+ with exceptions rather than just

    GPLv3+ (Todd Zullinger, #447772)
- drop unneeded patch to use gpgkeys_ldap for ldaps: URLs (#447772)

---

diff --git a/gnupg.spec b/gnupg.spec
index e7688f3..446e9e7 100644
--- a/gnupg.spec
+++ b/gnupg.spec
@@ -2,13 +2,12 @@ Summary: A GNU utility for secure communication and data storage
 Name: gnupg
 Version: 1.4.9
 Release: 3%{?dist}
-License: GPLv3+
+License: GPLv3+ with exceptions
 Group: Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 Source2: gnupg-shm-coprocessing.expect
 Patch0: gnupg-1.4.1-gcc.patch
-Patch1: gnupg-1.4.2-curl.patch
 Patch3: gnupg-1.4.6-dir.patch
 # Fix build failure with curl-7.18.1+ and gcc 4.3+
 # http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html
@@ -38,7 +37,6 @@ only IDEA for symmetric-key encryption, which is patented worldwide).
 %prep
 %setup -q
 %patch0 -p1 -b .gcc
-%patch1 -p0 -b .curl
 %patch3 -p1 -b .dir
 %patch4 -p1 -b .gcc43
 autoreconf
@@ -110,12 +108,17 @@ exit 0
 %{_mandir}/man7/*
 
 %changelog
+* Tue Jul 22 2008 Nalin Dahyabhai <nalin@redhat.com> - 1.4.9-4
+- describe license as actually GPLv3+ with exceptions rather than just GPLv3+
+  (Todd Zullinger, #447772)
+- drop unneeded patch to use gpgkeys_ldap for ldaps: URLs (#447772)
+
 * Tue May 27 2008 Nalin Dahyabhai <nalin@redhat.com> - 1.4.9-3
 - note license is actually GPLv3+ rather than just GPLv3 (Todd Zullinger,
   #447772)
 
 * Sat May 24 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.4.9-2
-- fix build failure with curl-7.18.1+ and gcc-4.3+
+- fix build failure with curl-7.18.1+ and gcc-4.3+ (#447772)
 
 * Mon May 19 2008 Dennis Gilmore <dennis@ausil.us> - 1.4.9-1.1
 - rebuild for sparc