diff -r d34fd1d7fa3e -r 2bd9bf3f6f03 gnupg/gnupg.spec --- a/gnupg/gnupg.spec Wed Nov 24 14:48:04 2010 +0100 +++ b/gnupg/gnupg.spec Mon Jan 10 20:54:01 2011 +0100 @@ -32,7 +32,7 @@ Group: PGP License: GPL Version: 2.0.16 -Release: 20101020 +Release: 20101026 # package options %option with_curl yes @@ -162,17 +162,19 @@ %install # install program rm -rf $RPM_BUILD_ROOT - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT - # 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 + # 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 # strip down and post-adjust installation files strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true @@ -187,8 +189,9 @@ # determine installation files %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ - '%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' %files -f files