[gnupg2/f19] Fix the insttools patch to apply.

[Tomáš Mráz]

commit 813fa3ff97458ce76910a9a959c06de2913edfd4
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Tue May 28 11:34:59 2013 +0200

    Fix the insttools patch to apply.

 gnupg-2.0.18-secmem.patch                          |   33 -------------------
 ...insttools.patch => gnupg-2.0.20-insttools.patch |   34 ++++++++++---------
 gnupg2.spec                                        |    2 +-
 3 files changed, 19 insertions(+), 50 deletions(-)
---
diff --git a/gnupg-2.0.19-insttools.patch b/gnupg-2.0.20-insttools.patch
similarity index 58%
rename from gnupg-2.0.19-insttools.patch
rename to gnupg-2.0.20-insttools.patch
index 5082574..80b796d 100644
--- a/gnupg-2.0.19-insttools.patch
+++ b/gnupg-2.0.20-insttools.patch
@@ -1,7 +1,7 @@
-diff -up gnupg-2.0.19/tools/Makefile.am.insttools gnupg-2.0.19/tools/Makefile.am
---- gnupg-2.0.19/tools/Makefile.am.insttools	2012-03-27 10:00:38.000000000 +0200
-+++ gnupg-2.0.19/tools/Makefile.am	2012-08-06 16:40:34.629466580 +0200
-@@ -32,8 +32,8 @@ sbin_SCRIPTS = addgnupghome applygnupgde
+diff -up gnupg-2.0.20/tools/Makefile.am.insttools gnupg-2.0.20/tools/Makefile.am
+--- gnupg-2.0.20/tools/Makefile.am.insttools	2013-05-10 14:55:49.000000000 +0200
++++ gnupg-2.0.20/tools/Makefile.am	2013-05-28 11:30:22.711552140 +0200
+@@ -36,8 +36,8 @@ sbin_SCRIPTS = addgnupghome applygnupgde
  
  bin_SCRIPTS = gpgsm-gencert.sh
  if HAVE_USTAR
@@ -12,42 +12,44 @@ diff -up gnupg-2.0.19/tools/Makefile.am.insttools gnupg-2.0.19/tools/Makefile.am
  endif
  
  if BUILD_SYMCRYPTRUN
-@@ -49,7 +49,7 @@ else
+@@ -53,7 +53,7 @@ else
  endif
  
  
 -bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} ${gpgtar}
-+bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} ${gpgtar} gpgsplit
++bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun} ${gpgtar} gpgsplit
  if !HAVE_W32_SYSTEM
  bin_PROGRAMS += watchgnupg gpgparsemail
  endif
-@@ -58,7 +58,7 @@ if !DISABLE_REGEX
+@@ -62,7 +62,7 @@ if !DISABLE_REGEX
  libexec_PROGRAMS = gpg-check-pattern
  endif
  
 -noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
-+noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert
++noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgkey2ssh
  
  common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
  pwquery_libs = ../common/libsimple-pwquery.a
-diff -up gnupg-2.0.19/tools/Makefile.in.insttools gnupg-2.0.19/tools/Makefile.in
---- gnupg-2.0.19/tools/Makefile.in.insttools	2012-03-27 10:22:48.000000000 +0200
-+++ gnupg-2.0.19/tools/Makefile.in	2012-08-06 16:41:39.535959261 +0200
-@@ -90,11 +90,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(sr
+diff -up gnupg-2.0.20/tools/Makefile.in.insttools gnupg-2.0.20/tools/Makefile.in
+--- gnupg-2.0.20/tools/Makefile.in.insttools	2013-05-10 15:56:30.000000000 +0200
++++ gnupg-2.0.20/tools/Makefile.in	2013-05-28 11:29:48.556819325 +0200
+@@ -107,12 +107,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(sr
  @GNUPG_PROTECT_TOOL_PGM_TRUE at am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
+ @HAVE_W32_SYSTEM_TRUE at am__append_7 = gpg-connect-agent-w32info.o
  bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
- 	gpgkey2ssh$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
+-	gpgkey2ssh$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
 -	$(am__EXEEXT_3)
++	$(am__EXEEXT_1) $(am__EXEEXT_2) \
 +	$(am__EXEEXT_3) gpgsplit$(EXEEXT)
- @HAVE_W32_SYSTEM_FALSE at am__append_7 = watchgnupg gpgparsemail
+ @HAVE_W32_SYSTEM_FALSE at am__append_8 = watchgnupg gpgparsemail
  @DISABLE_REGEX_FALSE at libexec_PROGRAMS = gpg-check-pattern$(EXEEXT)
  noinst_PROGRAMS = clean-sat$(EXEEXT) mk-tdata$(EXEEXT) \
 -	make-dns-cert$(EXEEXT) gpgsplit$(EXEEXT)
-+	make-dns-cert$(EXEEXT)
++	make-dns-cert$(EXEEXT) gpgkey2ssh$(EXEEXT)
  subdir = tools
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/gl/m4/absolute-header.m4 \
-@@ -454,7 +454,7 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER
+@@ -488,7 +488,7 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER
  sbin_SCRIPTS = addgnupghome applygnupgdefaults
  bin_SCRIPTS = gpgsm-gencert.sh
  # bin_SCRIPTS += gpg-zip
diff --git a/gnupg2.spec b/gnupg2.spec
index ec2bced..12587ee 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -9,7 +9,7 @@ Source0: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.
 Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2.sig
 # svn export svn://cvs.gnupg.org/gnupg/trunk gnupg2; tar cjf gnupg-<date>svn.tar.bz2 gnupg2
 #Source0: gnupg2-20090809svn.tar.bz2
-Patch1:  gnupg-2.0.19-insttools.patch
+Patch1:  gnupg-2.0.20-insttools.patch
 Patch3:  gnupg-2.0.20-secmem.patch
 Patch4:  gnupg-2.0.18-protect-tool-env.patch
 Patch5:  gnupg-2.0.20-ocsp-keyusage.patch