From 8bcd78e553d50a8946bb8fee2e4d24bad3af2cbedb64c043f27c09b28bbc935e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 28 Apr 2011 08:45:22 +0000 Subject: [PATCH] Accepting request 68635 from home:namtrac:branches:Base:System excellente! OBS-URL: https://build.opensuse.org/request/show/68635 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=24 --- gnupg-2.0.17-test-failure.patch | 21 +++++++++++++++++++++ gpgme.changes | 5 +++++ gpgme.spec | 5 ++++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnupg-2.0.17-test-failure.patch diff --git a/gnupg-2.0.17-test-failure.patch b/gnupg-2.0.17-test-failure.patch new file mode 100644 index 0000000..a11a03a --- /dev/null +++ b/gnupg-2.0.17-test-failure.patch @@ -0,0 +1,21 @@ +Cherry picked from commit 43f38db1afe9830b888076adeec1eec21f32335c + +From 43f38db1afe9830b888076adeec1eec21f32335c Mon Sep 17 00:00:00 2001 +From: Marcus Brinkmann +Date: Wed, 27 Apr 2011 12:56:19 +0200 +Subject: [PATCH] Update GPGME test suite for use with GnuPG 2.1. + +diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c +index 9da5ff0..9d00340 100644 +--- a/tests/gpg/t-encrypt-sign.c ++++ b/tests/gpg/t-encrypt-sign.c +@@ -60,7 +60,8 @@ check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type) + result->signatures->pubkey_algo); + exit (1); + } +- if (result->signatures->hash_algo != GPGME_MD_SHA1) ++ if (result->signatures->hash_algo != GPGME_MD_SHA1 ++ && result->signatures->hash_algo != GPGME_MD_RMD160) + { + fprintf (stderr, "Wrong hash algorithm reported: %i\n", + result->signatures->hash_algo); diff --git a/gpgme.changes b/gpgme.changes index b2104a4..25802f1 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 28 06:24:11 UTC 2011 - idoenmez@novell.com + +- Add gnupg-2.0.17-test-failure.patch: fix test failure with gnupg 2.0.17 + ------------------------------------------------------------------- Fri Feb 4 15:44:26 CET 2011 - sbrabec@suse.cz diff --git a/gpgme.spec b/gpgme.spec index 70a55b8..382d1a9 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -25,7 +25,7 @@ BuildRequires: libpth-devel >= 2.0.7 BuildRequires: pth >= 2.0.7 %endif Version: 1.3.0 -Release: 7 +Release: 8 License: GPLv2+ Summary: A Library Designed to Give Applications Easy Access to GnuPG Url: http://www.gnupg.org/related_software/gpgme/ @@ -33,6 +33,8 @@ Group: Productivity/Security Source: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2 Source2: baselibs.conf Patch0: gpgme-1.3.0-gpgme-config-remove-extraneous-libs.patch +# PATCH-FIX-UPSTREAM gnupg-2.0.17-test-failure.patch idoenmez@suse.de -- Fix test failure with gnupg 2.0.17 +Patch1: gnupg-2.0.17-test-failure.patch BuildRequires: libassuan-devel >= 1.1.0 BuildRequires: libgpg-error-devel >= 1.4 PreReq: %install_info_prereq @@ -103,6 +105,7 @@ of standard widgets for common key selection tasks is even planned. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build sh autogen.sh