From eb8cf1f04cc9f28bd0ed355f7f1a6c3a751b8cde1681a8dd637fe198cb4405eb Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Tue, 18 Jun 2013 08:20:25 +0000
Subject: [PATCH] Accepting request 179317 from Base:System

- revert usage of gpg-offline to avoid cycles

- add gnupg-2.0.20-automake113.diff to fix build with automake 1.13

OBS-URL: https://build.opensuse.org/request/show/179317
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=69
---
 gnupg-2.0.20-automake113.diff | 13 +++++++++++++
 gpg2.changes                  | 10 ++++++++++
 gpg2.spec                     |  7 +++----
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 gnupg-2.0.20-automake113.diff

diff --git a/gnupg-2.0.20-automake113.diff b/gnupg-2.0.20-automake113.diff
new file mode 100644
index 0000000..280a729
--- /dev/null
+++ b/gnupg-2.0.20-automake113.diff
@@ -0,0 +1,13 @@
+Index: gnupg-2.0.20/tests/openpgp/Makefile.am
+===================================================================
+--- gnupg-2.0.20.orig/tests/openpgp/Makefile.am
++++ gnupg-2.0.20/tests/openpgp/Makefile.am
+@@ -25,7 +25,7 @@ required_pgms = ../../g10/gpg2 ../../age
+ 
+ 
+ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C \
+-		    ../../agent/gpg-agent --quiet --daemon sh
++		    ../../agent/gpg-agent --quiet --daemon
+ 
+ 
+ TESTS = version.test mds.test \
diff --git a/gpg2.changes b/gpg2.changes
index 3e28590..87e1ee7 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jun 17 12:48:24 UTC 2013 - coolo@suse.com
+
+- revert usage of gpg-offline to avoid cycles
+
+-------------------------------------------------------------------
+Mon Jun 17 12:40:10 UTC 2013 - coolo@suse.com
+
+- add gnupg-2.0.20-automake113.diff to fix build with automake 1.13
+
 -------------------------------------------------------------------
 Tue May 14 14:00:45 UTC 2013 - vcizek@suse.com
 
diff --git a/gpg2.spec b/gpg2.spec
index 7c93ae7..38c3938 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -38,9 +38,6 @@ BuildRequires:  libpth-devel >= 1.3.7
 %else
 BuildRequires:  pth >= 1.3.7
 %endif
-%if 0%{?suse_version} >= 1230
-BuildRequires:  gpg-offline
-%endif
 Url:            http://www.gnupg.org/aegypten2/
 PreReq:         %install_info_prereq
 Requires:       dirmngr
@@ -66,6 +63,8 @@ Patch6:         gnupg-dont-fail-with-seahorse-agent.patch
 Patch7:         gnupg-broken-curl-test.patch
 Patch8:         gnupg-set_umask_before_open_outfile.patch
 Patch9:         gnupg-detect_FIPS_mode.patch
+# PATCH-FIX-OPENSUSE coolo@suse.de -- automake 1.13 already includes $SHELL
+Patch10:        gnupg-2.0.20-automake113.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -75,7 +74,6 @@ gpg-agent, and a keybox library.
 
 %lang_package
 %prep
-%{?gpg_verify: %gpg_verify %{S:2}}
 %setup  -q -n gnupg-%version
 %patch1 -p1
 %patch2
@@ -86,6 +84,7 @@ gpg-agent, and a keybox library.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 autoreconf -fi