# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1316605909 -7200
# Node ID b8e8f9dbbfd382e9d6c43631ef5b14590836f2e5
# Parent  442a711da911e54064c5a2bf4af50bbf15994d33
Update version and integrate setuid logic from upstream package vendor.

diff -r 442a711da911 -r b8e8f9dbbfd3 gnupg/gnupg.patch
--- a/gnupg/gnupg.patch	Wed Sep 21 13:46:39 2011 +0200
+++ b/gnupg/gnupg.patch	Wed Sep 21 13:51:49 2011 +0200
@@ -18,7 +18,7 @@
 Index: configure
 --- configure.orig	2009-09-04 18:09:14 +0200
 +++ configure	2009-09-06 23:05:29 +0200
-@@ -7992,13 +7992,13 @@
+@@ -7782,13 +7782,13 @@
  # Check wether it is necessary to link against libdl.
  #
  gnupg_dlopen_save_libs="$LIBS"
diff -r 442a711da911 -r b8e8f9dbbfd3 gnupg/gnupg.spec
--- a/gnupg/gnupg.spec	Wed Sep 21 13:46:39 2011 +0200
+++ b/gnupg/gnupg.spec	Wed Sep 21 13:51:49 2011 +0200
@@ -31,13 +31,14 @@
 Class:        PLUS
 Group:        PGP
 License:      GPL
-Version:      2.0.16
-Release:      20101026
+Version:      2.0.17
+Release:      20110914
 
 #   package options
 %option       with_curl  yes
 %option       with_ldap  no
 %option       with_idea  no
+%option       with_setuid no
 
 #   list of sources
 Source0:      ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
@@ -46,8 +47,8 @@
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20100101, make
-PreReq:       OpenPKG, openpkg >= 20100101, pinentry
+BuildPreReq:  OpenPKG, openpkg >= 20060823, make
+PreReq:       OpenPKG, openpkg >= 20060823, 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
@@ -64,6 +65,8 @@
 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
@@ -189,9 +192,15 @@
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
+%if "%{with_setuid}" == "yes"
         '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
 #        '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2' \
 #        '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg'
+%else
+        '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
+#        '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' \
+#        '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
+%endif
 
 %files -f files