diff --git a/gnupg-dont-fail-with-seahorse-agent.patch b/gnupg-dont-fail-with-seahorse-agent.patch deleted file mode 100644 index f0b3599..0000000 --- a/gnupg-dont-fail-with-seahorse-agent.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - g10/passphrase.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gnupg-2.0.15/g10/passphrase.c -=================================================================== ---- gnupg-2.0.15.orig/g10/passphrase.c 2010-01-11 15:11:17.000000000 +0100 -+++ gnupg-2.0.15/g10/passphrase.c 2010-04-07 16:06:49.000000000 +0200 -@@ -72,7 +72,7 @@ encode_s2k_iterations (int iterations) - { - /* Don't print an error if an older agent is used. */ - if (err && gpg_err_code (err) != GPG_ERR_ASS_PARAMETER) -- log_error (_("problem with the agent: %s\n"), gpg_strerror (err)); -+ log_info (_("problem with the agent: %s\n"), gpg_strerror (err)); - /* Default to 65536 which we used up to 2.0.13. */ - return 96; - } diff --git a/gpg2.changes b/gpg2.changes index f6d38a2..5f9f206 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Apr 7 14:19:11 UTC 2010 - puzel@novell.com - -- add gnupg-dont-fail-with-seahorse-agent.patch (bnc#589994) - ------------------------------------------------------------------- Wed Mar 31 13:47:00 UTC 2010 - puzel@novell.com diff --git a/gpg2.spec b/gpg2.spec index 6854147..65c5480 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -57,7 +57,6 @@ Patch11: gnupg-2.0.9-langinfo.patch Patch12: gnupg-files-are-digests.patch # PATCH-FIX-UPSTREAM gnupg-2.0.14-s2kcount.patch dimstar@opensuse.org -- use fixed s2k-count number to not use gpg-agent. Patch13: gnupg-2.0.14-s2kcount.patch -Patch14: gnupg-dont-fail-with-seahorse-agent.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,7 +72,6 @@ gpg-agent, and a keybox library. %patch11 %patch12 -p1 %patch13 -p1 -%patch14 -p1 %build # Required for patch7: