OpenPKG Specs / changeset

     1.1 --- a/gnupg/gnupg.patch	Fri Oct 22 23:04:26 2010 +0200
     1.2 +++ b/gnupg/gnupg.patch	Fri Oct 22 23:20:14 2010 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: agent/genkey.c
     1.5 ---- agent/genkey.c.orig	2007-11-19 16:11:31 +0100
     1.6 -+++ agent/genkey.c	2007-12-21 09:17:46 +0100
     1.7 -@@ -188,11 +188,9 @@
     1.8 +--- agent/genkey.c.orig	2009-06-29 08:20:15 +0200
     1.9 ++++ agent/genkey.c	2009-09-06 22:59:18 +0200
    1.10 +@@ -190,11 +190,9 @@
    1.11           return gpg_error (GPG_ERR_INV_PASSPHRASE);
    1.12   
    1.13         desc = xtryasprintf 
    1.14 @@ -16,24 +16,24 @@
    1.15           return gpg_error_from_syserror ();
    1.16         err = take_this_one_anyway (ctrl, desc);
    1.17  Index: configure
    1.18 ---- configure.orig	2007-12-20 09:40:04 +0100
    1.19 -+++ configure	2007-12-21 09:08:55 +0100
    1.20 -@@ -6909,13 +6909,13 @@
    1.21 +--- configure.orig	2009-09-04 18:09:14 +0200
    1.22 ++++ configure	2009-09-06 23:05:29 +0200
    1.23 +@@ -7992,13 +7992,13 @@
    1.24   # Check wether it is necessary to link against libdl.
    1.25   #
    1.26   gnupg_dlopen_save_libs="$LIBS"
    1.27  -LIBS=""
    1.28 - { echo "$as_me:$LINENO: checking for library containing dlopen" >&5
    1.29 - echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
    1.30 - if test "${ac_cv_search_dlopen+set}" = set; then
    1.31 -   echo $ECHO_N "(cached) $ECHO_C" >&6
    1.32 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
    1.33 + $as_echo_n "checking for library containing dlopen... " >&6; }
    1.34 + if test "${ac_cv_search_dlopen+set}" = set; then :
    1.35 +   $as_echo_n "(cached) " >&6
    1.36   else
    1.37     ac_func_search_save_LIBS=$LIBS
    1.38  +  LIBS=""
    1.39 - cat >conftest.$ac_ext <<_ACEOF
    1.40 - /* confdefs.h.  */
    1.41 - _ACEOF
    1.42 -Index: configure
    1.43 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1.44 + /* end confdefs.h.  */
    1.45 + 
    1.46 +Index: g10/seckey-cert.c
    1.47  --- g10/seckey-cert.c.orig	2008-03-18 17:46:32.000000000 +0100
    1.48  +++ g10/seckey-cert.c	2009-02-18 21:25:25.508715635 +0100
    1.49  @@ -209,6 +209,11 @@

     2.1 --- a/gnupg/gnupg.spec	Fri Oct 22 23:04:26 2010 +0200
     2.2 +++ b/gnupg/gnupg.spec	Fri Oct 22 23:20:14 2010 +0200
     2.3 @@ -1,6 +1,6 @@
     2.4  ##
     2.5  ##  gnupg.spec -- OpenPKG RPM Package Specification
     2.6 -##  Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.7 +##  Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.8  ##
     2.9  ##  Permission to use, copy, modify, and distribute this software for
    2.10  ##  any purpose with or without fee is hereby granted, provided that
    2.11 @@ -31,8 +31,8 @@
    2.12  Class:        PLUS
    2.13  Group:        PGP
    2.14  License:      GPL
    2.15 -Version:      2.0.11
    2.16 -Release:      20090408
    2.17 +Version:      2.0.16
    2.18 +Release:      20100719
    2.19  
    2.20  #   package options
    2.21  %option       with_curl  yes
    2.22 @@ -44,12 +44,10 @@
    2.23  Patch0:       gnupg.patch
    2.24  
    2.25  #   build information
    2.26 -Prefix:       %{l_prefix}
    2.27 -BuildRoot:    %{l_buildroot}
    2.28 -BuildPreReq:  OpenPKG, openpkg >= 20040130, make
    2.29 -PreReq:       OpenPKG, openpkg >= 20040130, pinentry
    2.30 -BuildPreReq:  gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 1.0.2, gpg-error >= 1.4
    2.31 -PreReq:       gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 1.0.2, gpg-error >= 1.4
    2.32 +BuildPreReq:  OpenPKG, openpkg >= 20100101, make
    2.33 +PreReq:       OpenPKG, openpkg >= 20100101, pinentry
    2.34 +BuildPreReq:  gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4
    2.35 +PreReq:       gcrypt >= 1.2.3, libksba >= 1.0.2, libassuan >= 2.0.0, gpg-error >= 1.4
    2.36  BuildPreReq:  zlib, bzip2, readline, pth, libiconv
    2.37  PreReq:       zlib, bzip2, readline, pth, libiconv
    2.38  %if "%{with_curl}" == "yes"
    2.39 @@ -64,8 +62,6 @@
    2.40  BuildPreReq:  gcrypt::with_idea
    2.41  PreReq:       gcrypt::with_idea
    2.42  %endif
    2.43 -AutoReq:      no
    2.44 -AutoReqProv:  no
    2.45  
    2.46  %description
    2.47      GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and
    2.48 @@ -132,13 +128,11 @@
    2.49          --with-agent-pgm=%{l_prefix}/bin/gpg-agent \
    2.50          --with-pinentry-pgm=%{l_prefix}/bin/pinentry \
    2.51          --with-dirmngr-pgm=%{l_prefix}/bin/dirmngr \
    2.52 -        --with-included-regex \
    2.53  %if "%{with_curl}" == "yes"
    2.54          --with-libcurl=%{l_prefix} \
    2.55  %else
    2.56          --without-libcurl \
    2.57  %endif
    2.58 -        --without-included-gettext \
    2.59          --without-libintl-prefix \
    2.60          --disable-nls \
    2.61          --disable-scdaemon \
    2.62 @@ -165,7 +159,6 @@
    2.63  
    2.64  %install
    2.65      #   install program
    2.66 -    rm -rf $RPM_BUILD_ROOT
    2.67      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
    2.68  
    2.69      #   provide unversioned names
    2.70 @@ -197,5 +190,4 @@
    2.71  %files -f files
    2.72  
    2.73  %clean
    2.74 -    rm -rf $RPM_BUILD_ROOT
    2.75