diff -r 09d8a3107646 -r 63f79f03cb7f gnupg/gnupg.spec
--- a/gnupg/gnupg.spec	Fri Aug 03 16:29:17 2012 +0200
+++ b/gnupg/gnupg.spec	Fri Aug 03 16:34:12 2012 +0200
@@ -31,24 +31,22 @@
 Class:        PLUS
 Group:        PGP
 License:      GPL
-Version:      2.0.17
-Release:      20110914
+Version:      2.0.19
+Release:      20120800
 
 #   package options
-%option       with_curl  yes
-%option       with_ldap  no
-%option       with_idea  no
-%option       with_setuid no
+%option       with_setuid yes
+%option       with_curl   yes
+%option       with_ldap   no
+%option       with_idea   no
 
 #   list of sources
 Source0:      ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
 Patch0:       gnupg.patch
 
 #   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823, make
-PreReq:       OpenPKG, openpkg >= 20060823, pinentry
+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
@@ -65,8 +63,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
@@ -160,24 +156,21 @@
         --disable-mailto
 
     #   build program
-    %{l_make} %{l_mflags}
+    %{l_make} %{l_mflags -O}
 
 %install
     #   install program
-    rm -rf $RPM_BUILD_ROOT
-    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+    %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
 
-    #   MSvB: facilitate PATH order of independent
-    #   MSvB: GnuPG v1 and GnuPG v2 installations.
-#    #   provide unversioned names
-#    ln  $RPM_BUILD_ROOT%{l_prefix}/bin/gpg2 \
-#        $RPM_BUILD_ROOT%{l_prefix}/bin/gpg
-#    ln  $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv2 \
-#        $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv
-#    ln  $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg2.1 \
-#        $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg.1
-#    ln  $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv2.1 \
-#        $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv.1
+    #   provide unversioned names
+    ln  $RPM_BUILD_ROOT%{l_prefix}/bin/gpg2 \
+        $RPM_BUILD_ROOT%{l_prefix}/bin/gpg
+    ln  $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv2 \
+        $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv
+    ln  $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg2.1 \
+        $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg.1
+    ln  $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv2.1 \
+        $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv.1
 
     #   strip down and post-adjust installation files
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
@@ -193,17 +186,14 @@
     %{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/gpg' \
         '%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/gpg' \
         '%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
 
 %clean
-    rm -rf $RPM_BUILD_ROOT