From 19791fc189df6d1c4dc93353bd52371839f085ce4500d2f32547deae08786495 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 17 Jun 2013 12:41:39 +0000 Subject: [PATCH] - add gnupg-2.0.20-automake113.diff to fix build with automake 1.13 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=58 --- gnupg-2.0.20-automake113.diff | 13 +++++++++++++ gpg2.changes | 5 +++++ gpg2.spec | 3 +++ 3 files changed, 21 insertions(+) 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..4339e7c 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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..012b164 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -66,6 +66,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 @@ -86,6 +88,7 @@ gpg-agent, and a keybox library. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build autoreconf -fi