1.1 --- a/gnupg/gnupg.spec Fri Aug 03 16:29:17 2012 +0200
1.2 +++ b/gnupg/gnupg.spec Fri Aug 03 16:34:12 2012 +0200
1.3 @@ -31,24 +31,22 @@
1.4 Class: PLUS
1.5 Group: PGP
1.6 License: GPL
1.7 -Version: 2.0.17
1.8 -Release: 20110914
1.9 +Version: 2.0.19
1.10 +Release: 20120800
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 +%option with_setuid yes
1.18 +%option with_curl yes
1.19 +%option with_ldap no
1.20 +%option with_idea no
1.21
1.22 # list of sources
1.23 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
1.24 Patch0: gnupg.patch
1.25
1.26 # build information
1.27 -Prefix: %{l_prefix}
1.28 -BuildRoot: %{l_buildroot}
1.29 -BuildPreReq: OpenPKG, openpkg >= 20060823, make
1.30 -PreReq: OpenPKG, openpkg >= 20060823, pinentry
1.31 +BuildPreReq: OpenPKG, openpkg >= 20100101, make
1.32 +PreReq: OpenPKG, openpkg >= 20100101, pinentry
1.33 BuildPreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4
1.34 PreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4
1.35 BuildPreReq: zlib, bzip2, readline, pth, libiconv
1.36 @@ -65,8 +63,6 @@
1.37 BuildPreReq: gcrypt::with_idea
1.38 PreReq: gcrypt::with_idea
1.39 %endif
1.40 -AutoReq: no
1.41 -AutoReqProv: no
1.42
1.43 %description
1.44 GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and
1.45 @@ -160,24 +156,21 @@
1.46 --disable-mailto
1.47
1.48 # build program
1.49 - %{l_make} %{l_mflags}
1.50 + %{l_make} %{l_mflags -O}
1.51
1.52 %install
1.53 # install program
1.54 - rm -rf $RPM_BUILD_ROOT
1.55 - %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
1.56 + %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
1.57
1.58 - # MSvB: facilitate PATH order of independent
1.59 - # MSvB: GnuPG v1 and GnuPG v2 installations.
1.60 -# # provide unversioned names
1.61 -# ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpg2 \
1.62 -# $RPM_BUILD_ROOT%{l_prefix}/bin/gpg
1.63 -# ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv2 \
1.64 -# $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv
1.65 -# ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg2.1 \
1.66 -# $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg.1
1.67 -# ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv2.1 \
1.68 -# $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv.1
1.69 + # provide unversioned names
1.70 + ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpg2 \
1.71 + $RPM_BUILD_ROOT%{l_prefix}/bin/gpg
1.72 + ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv2 \
1.73 + $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv
1.74 + ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg2.1 \
1.75 + $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg.1
1.76 + ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv2.1 \
1.77 + $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv.1
1.78
1.79 # strip down and post-adjust installation files
1.80 strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
1.81 @@ -193,17 +186,14 @@
1.82 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
1.83 %{l_files_std} \
1.84 %if "%{with_setuid}" == "yes"
1.85 + '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' \
1.86 '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
1.87 -# '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2' \
1.88 -# '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg'
1.89 %else
1.90 + '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' \
1.91 '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
1.92 -# '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' \
1.93 -# '%attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
1.94 %endif
1.95
1.96 %files -f files
1.97
1.98 %clean
1.99 - rm -rf $RPM_BUILD_ROOT
1.100
