1.1 --- a/gnupg/gnupg.spec Fri Oct 22 23:04:26 2010 +0200 1.2 +++ b/gnupg/gnupg.spec Fri Oct 22 23:20:14 2010 +0200 1.3 @@ -1,6 +1,6 @@ 1.4 ## 1.5 ## gnupg.spec -- OpenPKG RPM Package Specification 1.6 -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> 1.7 +## Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/> 1.8 ## 1.9 ## Permission to use, copy, modify, and distribute this software for 1.10 ## any purpose with or without fee is hereby granted, provided that 1.11 @@ -31,8 +31,8 @@ 1.12 Class: PLUS 1.13 Group: PGP 1.14 License: GPL 1.15 -Version: 2.0.11 1.16 -Release: 20090408 1.17 +Version: 2.0.16 1.18 +Release: 20100719 1.19 1.20 # package options 1.21 %option with_curl yes 1.22 @@ -44,12 +44,10 @@ 1.23 Patch0: gnupg.patch 1.24 1.25 # build information 1.26 -Prefix: %{l_prefix} 1.27 -BuildRoot: %{l_buildroot} 1.28 -BuildPreReq: OpenPKG, openpkg >= 20040130, make 1.29 -PreReq: OpenPKG, openpkg >= 20040130, pinentry 1.30 -BuildPreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 1.0.2, gpg-error >= 1.4 1.31 -PreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 1.0.2, gpg-error >= 1.4 1.32 +BuildPreReq: OpenPKG, openpkg >= 20100101, make 1.33 +PreReq: OpenPKG, openpkg >= 20100101, pinentry 1.34 +BuildPreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4 1.35 +PreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4 1.36 BuildPreReq: zlib, bzip2, readline, pth, libiconv 1.37 PreReq: zlib, bzip2, readline, pth, libiconv 1.38 %if "%{with_curl}" == "yes" 1.39 @@ -64,8 +62,6 @@ 1.40 BuildPreReq: gcrypt::with_idea 1.41 PreReq: gcrypt::with_idea 1.42 %endif 1.43 -AutoReq: no 1.44 -AutoReqProv: no 1.45 1.46 %description 1.47 GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and 1.48 @@ -132,13 +128,11 @@ 1.49 --with-agent-pgm=%{l_prefix}/bin/gpg-agent \ 1.50 --with-pinentry-pgm=%{l_prefix}/bin/pinentry \ 1.51 --with-dirmngr-pgm=%{l_prefix}/bin/dirmngr \ 1.52 - --with-included-regex \ 1.53 %if "%{with_curl}" == "yes" 1.54 --with-libcurl=%{l_prefix} \ 1.55 %else 1.56 --without-libcurl \ 1.57 %endif 1.58 - --without-included-gettext \ 1.59 --without-libintl-prefix \ 1.60 --disable-nls \ 1.61 --disable-scdaemon \ 1.62 @@ -165,7 +159,6 @@ 1.63 1.64 %install 1.65 # install program 1.66 - rm -rf $RPM_BUILD_ROOT 1.67 %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" 1.68 1.69 # provide unversioned names 1.70 @@ -197,5 +190,4 @@ 1.71 %files -f files 1.72 1.73 %clean 1.74 - rm -rf $RPM_BUILD_ROOT 1.75