From 0a8776a1d2d61b8303eb96aabf1baf1aff0de5ffe291bf2b41056c88628817e6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 14 Apr 2010 13:28:47 +0000 Subject: [PATCH] Accepting request 37836 from Base:System Copy from Base:System/gpg2 based on submit request 37836 from user puzel OBS-URL: https://build.opensuse.org/request/show/37836 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=41 --- gpg2.changes | 12 ++++++++++++ gpg2.spec | 13 +++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/gpg2.changes b/gpg2.changes index f6d38a2..cc98578 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Apr 9 12:47:11 UTC 2010 - chris@computersalat.de + +- fix deps + o libassuan-devel >= 2.0.0 + o pth / libpth-devel >= 1.3.7 +- added BuildReq libcurl-devel >= 7.10 +- removed BuildReq openldap2 + is already solved by openldap2-devel +- removed unrecognized configure options + --enable-external-hkp, --enable-shared, --enable-static-rnd + ------------------------------------------------------------------- Wed Apr 7 14:19:11 UTC 2010 - puzel@novell.com diff --git a/gpg2.spec b/gpg2.spec index 87b3600..cde033f 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -20,24 +20,24 @@ Name: gpg2 Version: 2.0.15 -Release: 2 +Release: 3 BuildRequires: expect BuildRequires: fdupes BuildRequires: libgpg-error-devel >= 1.4 BuildRequires: libgcrypt-devel >= 1.4.0 BuildRequires: libksba-devel >= 1.0.2 -BuildRequires: libassuan-devel >= 1.0.4 +BuildRequires: libassuan-devel >= 2.0.0 BuildRequires: opensc-devel BuildRequires: libusb-devel BuildRequires: readline-devel BuildRequires: zlib-devel BuildRequires: libadns-devel BuildRequires: openldap2-devel -BuildRequires: openldap2 +BuildRequires: libcurl-devel >= 7.10 %if 0%{?suse_version} >= 1120 -BuildRequires: libpth-devel +BuildRequires: libpth-devel >= 1.3.7 %else -BuildRequires: pth +BuildRequires: pth >= 1.3.7 %endif Url: http://www.gnupg.org/aegypten2/ License: GPLv2+ @@ -98,11 +98,8 @@ CFLAGS="%{optflags} -fpie" LDFLAGS=-pie \ --with-dirmngr-pgm=%{_prefix}/bin/dirmngr \ --with-scdaemon-pgm=%{_prefix}/bin/scdaemon \ --enable-ldap \ - --enable-external-hkp \ - --enable-shared \ --enable-gpgsm=yes \ --enable-gpg \ - --enable-static-rnd=linux \ --with-gnu-ld make %{?jobs:-j%jobs};