# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1287782414 -7200
# Node ID 552d1939222fed877b81715234cf1882fc6d9a75
# Parent  a737f787c44aea7b78db67f09a9984b3ebfad9c6
Resynchronize with upstream package maintainer version.

diff -r a737f787c44a -r 552d1939222f gnupg/gnupg.patch
--- a/gnupg/gnupg.patch	Fri Oct 22 23:04:26 2010 +0200
+++ b/gnupg/gnupg.patch	Fri Oct 22 23:20:14 2010 +0200
@@ -1,7 +1,7 @@
 Index: agent/genkey.c
---- agent/genkey.c.orig	2007-11-19 16:11:31 +0100
-+++ agent/genkey.c	2007-12-21 09:17:46 +0100
-@@ -188,11 +188,9 @@
+--- agent/genkey.c.orig	2009-06-29 08:20:15 +0200
++++ agent/genkey.c	2009-09-06 22:59:18 +0200
+@@ -190,11 +190,9 @@
          return gpg_error (GPG_ERR_INV_PASSPHRASE);
  
        desc = xtryasprintf 
@@ -16,24 +16,24 @@
          return gpg_error_from_syserror ();
        err = take_this_one_anyway (ctrl, desc);
 Index: configure
---- configure.orig	2007-12-20 09:40:04 +0100
-+++ configure	2007-12-21 09:08:55 +0100
-@@ -6909,13 +6909,13 @@
+--- configure.orig	2009-09-04 18:09:14 +0200
++++ configure	2009-09-06 23:05:29 +0200
+@@ -7992,13 +7992,13 @@
  # Check wether it is necessary to link against libdl.
  #
  gnupg_dlopen_save_libs="$LIBS"
 -LIBS=""
- { echo "$as_me:$LINENO: checking for library containing dlopen" >&5
- echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
- if test "${ac_cv_search_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+ $as_echo_n "checking for library containing dlopen... " >&6; }
+ if test "${ac_cv_search_dlopen+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
 +  LIBS=""
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-Index: configure
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+Index: g10/seckey-cert.c
 --- g10/seckey-cert.c.orig	2008-03-18 17:46:32.000000000 +0100
 +++ g10/seckey-cert.c	2009-02-18 21:25:25.508715635 +0100
 @@ -209,6 +209,11 @@
diff -r a737f787c44a -r 552d1939222f gnupg/gnupg.spec
--- a/gnupg/gnupg.spec	Fri Oct 22 23:04:26 2010 +0200
+++ b/gnupg/gnupg.spec	Fri Oct 22 23:20:14 2010 +0200
@@ -1,6 +1,6 @@
 ##
 ##  gnupg.spec -- OpenPKG RPM Package Specification
-##  Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
+##  Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
 ##
 ##  Permission to use, copy, modify, and distribute this software for
 ##  any purpose with or without fee is hereby granted, provided that
@@ -31,8 +31,8 @@
 Class:        PLUS
 Group:        PGP
 License:      GPL
-Version:      2.0.11
-Release:      20090408
+Version:      2.0.16
+Release:      20100719
 
 #   package options
 %option       with_curl  yes
@@ -44,12 +44,10 @@
 Patch0:       gnupg.patch
 
 #   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, make
-PreReq:       OpenPKG, openpkg >= 20040130, pinentry
-BuildPreReq:  gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 1.0.2, gpg-error >= 1.4
-PreReq:       gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 1.0.2, gpg-error >= 1.4
+BuildPreReq:  OpenPKG, openpkg >= 20100101, make
+PreReq:       OpenPKG, openpkg >= 20100101, pinentry
+BuildPreReq:  gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4
+PreReq:       gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4
 BuildPreReq:  zlib, bzip2, readline, pth, libiconv
 PreReq:       zlib, bzip2, readline, pth, libiconv
 %if "%{with_curl}" == "yes"
@@ -64,8 +62,6 @@
 BuildPreReq:  gcrypt::with_idea
 PreReq:       gcrypt::with_idea
 %endif
-AutoReq:      no
-AutoReqProv:  no
 
 %description
     GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and
@@ -132,13 +128,11 @@
         --with-agent-pgm=%{l_prefix}/bin/gpg-agent \
         --with-pinentry-pgm=%{l_prefix}/bin/pinentry \
         --with-dirmngr-pgm=%{l_prefix}/bin/dirmngr \
-        --with-included-regex \
 %if "%{with_curl}" == "yes"
         --with-libcurl=%{l_prefix} \
 %else
         --without-libcurl \
 %endif
-        --without-included-gettext \
         --without-libintl-prefix \
         --disable-nls \
         --disable-scdaemon \
@@ -165,7 +159,6 @@
 
 %install
     #   install program
-    rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
 
     #   provide unversioned names
@@ -197,5 +190,4 @@
 %files -f files
 
 %clean
-    rm -rf $RPM_BUILD_ROOT