1.1 --- a/gnupg/gnupg.spec Wed Sep 21 13:46:39 2011 +0200
1.2 +++ b/gnupg/gnupg.spec Wed Sep 21 13:51:49 2011 +0200
1.3 @@ -31,13 +31,14 @@
1.4 Class: PLUS
1.5 Group: PGP
1.6 License: GPL
1.7 -Version: 2.0.16
1.8 -Release: 20101026
1.9 +Version: 2.0.17
1.10 +Release: 20110914
1.11
1.12 # package options
1.13 %option with_curl yes
1.14 %option with_ldap no
1.15 %option with_idea no
1.16 +%option with_setuid no
1.17
1.18 # list of sources
1.19 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
1.20 @@ -46,8 +47,8 @@
1.21 # build information
1.22 Prefix: %{l_prefix}
1.23 BuildRoot: %{l_buildroot}
1.24 -BuildPreReq: OpenPKG, openpkg >= 20100101, make
1.25 -PreReq: OpenPKG, openpkg >= 20100101, pinentry
1.26 +BuildPreReq: OpenPKG, openpkg >= 20060823, make
1.27 +PreReq: OpenPKG, openpkg >= 20060823, pinentry
1.28 BuildPreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4
1.29 PreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4
1.30 BuildPreReq: zlib, bzip2, readline, pth, libiconv
1.31 @@ -64,6 +65,8 @@
1.32 BuildPreReq: gcrypt::with_idea
1.33 PreReq: gcrypt::with_idea
1.34 %endif
1.35 +AutoReq: no
1.36 +AutoReqProv: no
1.37
1.38 %description
1.39 GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and
1.40 @@ -189,9 +192,15 @@
1.41 # determine installation files
1.42 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
1.43 %{l_files_std} \
1.44 +%if "%{with_setuid}" == "yes"
1.45 '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
1.46 # '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2' \
1.47 # '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg'
1.48 +%else
1.49 + '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
1.50 +# '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' \
1.51 +# '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
1.52 +%endif
1.53
1.54 %files -f files
1.55
