diff -r a737f787c44a -r 552d1939222f gnupg/gnupg.spec --- a/gnupg/gnupg.spec Fri Oct 22 23:04:26 2010 +0200 +++ b/gnupg/gnupg.spec Fri Oct 22 23:20:14 2010 +0200 @@ -1,6 +1,6 @@ ## ## gnupg.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. +## Copyright (c) 2000-2010 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -31,8 +31,8 @@ Class: PLUS Group: PGP License: GPL -Version: 2.0.11 -Release: 20090408 +Version: 2.0.16 +Release: 20100719 # package options %option with_curl yes @@ -44,12 +44,10 @@ Patch0: gnupg.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, make -PreReq: OpenPKG, openpkg >= 20040130, pinentry -BuildPreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 1.0.2, gpg-error >= 1.4 -PreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 1.0.2, gpg-error >= 1.4 +BuildPreReq: OpenPKG, openpkg >= 20100101, make +PreReq: OpenPKG, openpkg >= 20100101, pinentry +BuildPreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4 +PreReq: gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4 BuildPreReq: zlib, bzip2, readline, pth, libiconv PreReq: zlib, bzip2, readline, pth, libiconv %if "%{with_curl}" == "yes" @@ -64,8 +62,6 @@ BuildPreReq: gcrypt::with_idea PreReq: gcrypt::with_idea %endif -AutoReq: no -AutoReqProv: no %description GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and @@ -132,13 +128,11 @@ --with-agent-pgm=%{l_prefix}/bin/gpg-agent \ --with-pinentry-pgm=%{l_prefix}/bin/pinentry \ --with-dirmngr-pgm=%{l_prefix}/bin/dirmngr \ - --with-included-regex \ %if "%{with_curl}" == "yes" --with-libcurl=%{l_prefix} \ %else --without-libcurl \ %endif - --without-included-gettext \ --without-libintl-prefix \ --disable-nls \ --disable-scdaemon \ @@ -165,7 +159,6 @@ %install # install program - rm -rf $RPM_BUILD_ROOT %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" # provide unversioned names @@ -197,5 +190,4 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT