1.1 --- a/gnupg/gnupg.spec Wed Nov 24 14:48:04 2010 +0100
1.2 +++ b/gnupg/gnupg.spec Mon Jan 10 20:54:01 2011 +0100
1.3 @@ -32,7 +32,7 @@
1.4 Group: PGP
1.5 License: GPL
1.6 Version: 2.0.16
1.7 -Release: 20101020
1.8 +Release: 20101026
1.9
1.10 # package options
1.11 %option with_curl yes
1.12 @@ -162,17 +162,19 @@
1.13 %install
1.14 # install program
1.15 rm -rf $RPM_BUILD_ROOT
1.16 - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
1.17 + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
1.18
1.19 - # provide unversioned names
1.20 - ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpg2 \
1.21 - $RPM_BUILD_ROOT%{l_prefix}/bin/gpg
1.22 - ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv2 \
1.23 - $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv
1.24 - ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg2.1 \
1.25 - $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg.1
1.26 - ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv2.1 \
1.27 - $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv.1
1.28 + # MSvB: facilitate PATH order of independent
1.29 + # MSvB: GnuPG v1 and GnuPG v2 installations.
1.30 +# # provide unversioned names
1.31 +# ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpg2 \
1.32 +# $RPM_BUILD_ROOT%{l_prefix}/bin/gpg
1.33 +# ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv2 \
1.34 +# $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv
1.35 +# ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg2.1 \
1.36 +# $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg.1
1.37 +# ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv2.1 \
1.38 +# $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv.1
1.39
1.40 # strip down and post-adjust installation files
1.41 strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
1.42 @@ -187,8 +189,9 @@
1.43 # determine installation files
1.44 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
1.45 %{l_files_std} \
1.46 - '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' \
1.47 '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2'
1.48 +# '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2' \
1.49 +# '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg'
1.50
1.51 %files -f files
1.52
