From ac517a3c7bb7aad3ec91d9aa6bef31e8fea0f6bd Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Mon, 6 Aug 2012 16:44:04 +0200 Subject: [PATCH] Make the insttools patch to apply. --- ...ools.patch => gnupg-2.0.19-insttools.patch | 34 +++++++++---------- gnupg2.spec | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) rename gnupg-2.0.13-insttools.patch => gnupg-2.0.19-insttools.patch (64%) diff --git a/gnupg-2.0.13-insttools.patch b/gnupg-2.0.19-insttools.patch similarity index 64% rename from gnupg-2.0.13-insttools.patch rename to gnupg-2.0.19-insttools.patch index 415f320..5082574 100644 --- a/gnupg-2.0.13-insttools.patch +++ b/gnupg-2.0.19-insttools.patch @@ -1,6 +1,6 @@ -diff -up gnupg-2.0.13/tools/Makefile.am.insttools gnupg-2.0.13/tools/Makefile.am ---- gnupg-2.0.13/tools/Makefile.am.insttools 2009-04-17 19:39:47.000000000 +0200 -+++ gnupg-2.0.13/tools/Makefile.am 2009-10-21 14:13:42.000000000 +0200 +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 bin_SCRIPTS = gpgsm-gencert.sh @@ -12,16 +12,16 @@ diff -up gnupg-2.0.13/tools/Makefile.am.insttools gnupg-2.0.13/tools/Makefile.am endif if BUILD_SYMCRYPTRUN -@@ -42,7 +42,7 @@ else - symcryptrun = +@@ -49,7 +49,7 @@ else endif --bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} -+bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} gpgsplit + +-bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} ${gpgtar} ++bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} ${gpgtar} gpgsplit if !HAVE_W32_SYSTEM bin_PROGRAMS += watchgnupg gpgparsemail endif -@@ -51,7 +51,7 @@ if !DISABLE_REGEX +@@ -58,7 +58,7 @@ if !DISABLE_REGEX libexec_PROGRAMS = gpg-check-pattern endif @@ -30,15 +30,15 @@ diff -up gnupg-2.0.13/tools/Makefile.am.insttools gnupg-2.0.13/tools/Makefile.am common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a pwquery_libs = ../common/libsimple-pwquery.a -diff -up gnupg-2.0.13/tools/Makefile.in.insttools gnupg-2.0.13/tools/Makefile.in ---- gnupg-2.0.13/tools/Makefile.in.insttools 2009-09-04 18:09:12.000000000 +0200 -+++ gnupg-2.0.13/tools/Makefile.in 2009-10-21 14:15:17.000000000 +0200 -@@ -87,11 +87,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(sr - @GNUPG_DIRMNGR_PGM_TRUE@am__append_5 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\"" +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 @GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\"" bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \ -- gpgkey2ssh$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) -+ gpgkey2ssh$(EXEEXT) gpgsplit$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) + gpgkey2ssh$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \ +- $(am__EXEEXT_3) ++ $(am__EXEEXT_3) gpgsplit$(EXEEXT) @HAVE_W32_SYSTEM_FALSE@am__append_7 = watchgnupg gpgparsemail @DISABLE_REGEX_FALSE@libexec_PROGRAMS = gpg-check-pattern$(EXEEXT) noinst_PROGRAMS = clean-sat$(EXEEXT) mk-tdata$(EXEEXT) \ @@ -47,7 +47,7 @@ diff -up gnupg-2.0.13/tools/Makefile.in.insttools gnupg-2.0.13/tools/Makefile.in subdir = tools ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/gl/m4/absolute-header.m4 \ -@@ -425,7 +425,7 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER +@@ -454,7 +454,7 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER sbin_SCRIPTS = addgnupghome applygnupgdefaults bin_SCRIPTS = gpgsm-gencert.sh # bin_SCRIPTS += gpg-zip @@ -55,4 +55,4 @@ diff -up gnupg-2.0.13/tools/Makefile.in.insttools gnupg-2.0.13/tools/Makefile.in +@HAVE_USTAR_TRUE@bin_SCRIPTS += gpg-zip @BUILD_SYMCRYPTRUN_FALSE@symcryptrun = @BUILD_SYMCRYPTRUN_TRUE@symcryptrun = symcryptrun - common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a + @BUILD_GPGTAR_FALSE@gpgtar = diff --git a/gnupg2.spec b/gnupg2.spec index 7455f86..15185f1 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-svn.tar.bz2 gnupg2 #Source0: gnupg2-20090809svn.tar.bz2 -Patch1: gnupg-2.0.13-insttools.patch +Patch1: gnupg-2.0.19-insttools.patch Patch2: gnupg-2.0.16-tests-s2kcount.patch Patch3: gnupg-2.0.18-secmem.patch Patch4: gnupg-2.0.18-protect-tool-env.patch