- fix the insttools patch
This commit is contained in:
Dan Horák
parent
6485bfd24b
commit
a5c43ea735
@ -1,13 +1,13 @@
|
||||
diff -up gnupg-2.1.10/tools/Makefile.am.insttools gnupg-2.1.10/tools/Makefile.am
|
||||
--- gnupg-2.1.10/tools/Makefile.am.insttools 2015-11-30 17:39:52.000000000 +0100
|
||||
+++ gnupg-2.1.10/tools/Makefile.am 2016-01-13 15:59:24.368328089 +0100
|
||||
--- gnupg-2.1.10/tools/Makefile.am.insttools 2015-11-30 11:39:52.000000000 -0500
|
||||
+++ gnupg-2.1.10/tools/Makefile.am 2016-01-13 17:39:33.068399050 -0500
|
||||
@@ -35,8 +35,8 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER
|
||||
sbin_SCRIPTS = addgnupghome applygnupgdefaults
|
||||
|
||||
if HAVE_USTAR
|
||||
-# bin_SCRIPTS += gpg-zip
|
||||
-noinst_SCRIPTS = gpg-zip
|
||||
+bin_SCRIPTS += gpg-zip
|
||||
+bin_SCRIPTS = gpg-zip
|
||||
+#noinst_SCRIPTS = gpg-zip
|
||||
endif
|
||||
|
||||
@ -37,14 +37,14 @@ diff -up gnupg-2.1.10/tools/Makefile.am.insttools gnupg-2.1.10/tools/Makefile.am
|
||||
|
||||
common_libs = $(libcommon)
|
||||
diff -up gnupg-2.1.10/tools/Makefile.in.insttools gnupg-2.1.10/tools/Makefile.in
|
||||
--- gnupg-2.1.10/tools/Makefile.in.insttools 2015-12-04 10:57:06.000000000 +0100
|
||||
+++ gnupg-2.1.10/tools/Makefile.in 2016-01-13 16:02:57.079201039 +0100
|
||||
--- gnupg-2.1.10/tools/Makefile.in.insttools 2015-12-04 04:57:06.000000000 -0500
|
||||
+++ gnupg-2.1.10/tools/Makefile.in 2016-01-13 17:39:48.298399050 -0500
|
||||
@@ -139,12 +139,12 @@ DIST_COMMON = $(top_srcdir)/am/cmacros.a
|
||||
bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
|
||||
$(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4)
|
||||
@HAVE_W32_SYSTEM_FALSE@am__append_9 = watchgnupg gpgparsemail
|
||||
-@HAVE_W32CE_SYSTEM_FALSE@am__append_10 = gpgkey2ssh ${gpgtar}
|
||||
+@HAVE_W32CE_SYSTEM_FALSE@am__append_10 = gpgsplit ${gpgtar}
|
||||
+@HAVE_W32CE_SYSTEM_FALSE@am__append_10 = ${gpgtar} gpgsplit
|
||||
@DISABLE_REGEX_FALSE@libexec_PROGRAMS = gpg-check-pattern$(EXEEXT)
|
||||
@HAVE_W32CE_SYSTEM_FALSE@noinst_PROGRAMS = clean-sat$(EXEEXT) \
|
||||
@HAVE_W32CE_SYSTEM_FALSE@ mk-tdata$(EXEEXT) \
|
||||
@ -54,21 +54,140 @@ diff -up gnupg-2.1.10/tools/Makefile.in.insttools gnupg-2.1.10/tools/Makefile.in
|
||||
subdir = tools
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
|
||||
@@ -170,7 +170,7 @@ CONFIG_CLEAN_VPATH_FILES =
|
||||
@@ -170,10 +170,10 @@ CONFIG_CLEAN_VPATH_FILES =
|
||||
@HAVE_W32_SYSTEM_FALSE@am__EXEEXT_2 = watchgnupg$(EXEEXT) \
|
||||
@HAVE_W32_SYSTEM_FALSE@ gpgparsemail$(EXEEXT)
|
||||
@BUILD_GPGTAR_TRUE@am__EXEEXT_3 = gpgtar$(EXEEXT)
|
||||
-@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_4 = gpgkey2ssh$(EXEEXT) \
|
||||
+@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_4 = gpgsplit$(EXEEXT) \
|
||||
@HAVE_W32CE_SYSTEM_FALSE@ $(am__EXEEXT_3)
|
||||
-@HAVE_W32CE_SYSTEM_FALSE@ $(am__EXEEXT_3)
|
||||
+@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_4 = $(am__EXEEXT_3) \
|
||||
+@HAVE_W32CE_SYSTEM_FALSE@ gpgsplit$(EXEEXT)
|
||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
|
||||
"$(DESTDIR)$(sbindir)"
|
||||
@@ -566,7 +566,7 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER
|
||||
- "$(DESTDIR)$(sbindir)"
|
||||
+ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
|
||||
PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
|
||||
clean_sat_SOURCES = clean-sat.c
|
||||
clean_sat_OBJECTS = clean-sat.$(OBJEXT)
|
||||
@@ -285,7 +285,7 @@ am__uninstall_files_from_dir = { \
|
||||
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
|
||||
$(am__cd) "$$dir" && rm -f $$files; }; \
|
||||
}
|
||||
-SCRIPTS = $(noinst_SCRIPTS) $(sbin_SCRIPTS)
|
||||
+SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS)
|
||||
AM_V_P = $(am__v_P_@AM_V@)
|
||||
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
|
||||
am__v_P_0 = false
|
||||
@@ -564,10 +564,9 @@ libcommontls = ../common/libcommontls.a
|
||||
libcommontlsnpth = ../common/libcommontlsnpth.a
|
||||
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
|
||||
sbin_SCRIPTS = addgnupghome applygnupgdefaults
|
||||
|
||||
# bin_SCRIPTS += gpg-zip
|
||||
-
|
||||
-# bin_SCRIPTS += gpg-zip
|
||||
-@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
|
||||
+@HAVE_USTAR_TRUE@bin_SCRIPTS += gpg-zip
|
||||
+@HAVE_USTAR_TRUE@bin_SCRIPTS = gpg-zip
|
||||
@BUILD_SYMCRYPTRUN_FALSE@symcryptrun =
|
||||
+#noinst_SCRIPTS = gpg-zip
|
||||
@BUILD_SYMCRYPTRUN_TRUE@symcryptrun = symcryptrun
|
||||
@BUILD_GPGTAR_FALSE@gpgtar =
|
||||
@BUILD_GPGTAR_TRUE@gpgtar = gpgtar
|
||||
@@ -806,6 +805,41 @@ symcryptrun$(EXEEXT): $(symcryptrun_OBJE
|
||||
watchgnupg$(EXEEXT): $(watchgnupg_OBJECTS) $(watchgnupg_DEPENDENCIES) $(EXTRA_watchgnupg_DEPENDENCIES)
|
||||
@rm -f watchgnupg$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(watchgnupg_OBJECTS) $(watchgnupg_LDADD) $(LIBS)
|
||||
+install-binSCRIPTS: $(bin_SCRIPTS)
|
||||
+ @$(NORMAL_INSTALL)
|
||||
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
|
||||
+ if test -n "$$list"; then \
|
||||
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
|
||||
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
|
||||
+ fi; \
|
||||
+ for p in $$list; do \
|
||||
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
|
||||
+ done | \
|
||||
+ sed -e 'p;s,.*/,,;n' \
|
||||
+ -e 'h;s|.*|.|' \
|
||||
+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
|
||||
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
|
||||
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
|
||||
+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \
|
||||
+ if (++n[d] == $(am__install_max)) { \
|
||||
+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
|
||||
+ else { print "f", d "/" $$4, $$1 } } \
|
||||
+ END { for (d in files) print "f", d, files[d] }' | \
|
||||
+ while read type dir files; do \
|
||||
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
|
||||
+ test -z "$$files" || { \
|
||||
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
|
||||
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
|
||||
+ } \
|
||||
+ ; done
|
||||
+
|
||||
+uninstall-binSCRIPTS:
|
||||
+ @$(NORMAL_UNINSTALL)
|
||||
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
|
||||
+ files=`for p in $$list; do echo "$$p"; done | \
|
||||
+ sed -e 's,.*/,,;$(transform)'`; \
|
||||
+ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
|
||||
install-sbinSCRIPTS: $(sbin_SCRIPTS)
|
||||
@$(NORMAL_INSTALL)
|
||||
@list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
|
||||
@@ -1066,7 +1100,7 @@ check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile $(PROGRAMS) $(SCRIPTS)
|
||||
installdirs:
|
||||
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)"; do \
|
||||
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \
|
||||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
done
|
||||
install: install-am
|
||||
@@ -1128,8 +1162,8 @@ install-dvi: install-dvi-am
|
||||
|
||||
install-dvi-am:
|
||||
|
||||
-install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
|
||||
- install-sbinSCRIPTS
|
||||
+install-exec-am: install-binPROGRAMS install-binSCRIPTS \
|
||||
+ install-libexecPROGRAMS install-sbinSCRIPTS
|
||||
|
||||
install-html: install-html-am
|
||||
|
||||
@@ -1168,8 +1202,8 @@ ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
-uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS \
|
||||
- uninstall-sbinSCRIPTS
|
||||
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
|
||||
+ uninstall-libexecPROGRAMS uninstall-sbinSCRIPTS
|
||||
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
@@ -1178,16 +1212,17 @@ uninstall-am: uninstall-binPROGRAMS unin
|
||||
clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
|
||||
distclean-compile distclean-generic distclean-tags distdir dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
- install-binPROGRAMS install-data install-data-am install-dvi \
|
||||
- install-dvi-am install-exec install-exec-am install-html \
|
||||
- install-html-am install-info install-info-am \
|
||||
- install-libexecPROGRAMS install-man install-pdf install-pdf-am \
|
||||
- install-ps install-ps-am install-sbinSCRIPTS install-strip \
|
||||
- installcheck installcheck-am installdirs maintainer-clean \
|
||||
- maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||
- mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
|
||||
- uninstall-am uninstall-binPROGRAMS uninstall-libexecPROGRAMS \
|
||||
- uninstall-sbinSCRIPTS
|
||||
+ install-binPROGRAMS install-binSCRIPTS install-data \
|
||||
+ install-data-am install-dvi install-dvi-am install-exec \
|
||||
+ install-exec-am install-html install-html-am install-info \
|
||||
+ install-info-am install-libexecPROGRAMS install-man \
|
||||
+ install-pdf install-pdf-am install-ps install-ps-am \
|
||||
+ install-sbinSCRIPTS install-strip installcheck installcheck-am \
|
||||
+ installdirs maintainer-clean maintainer-clean-generic \
|
||||
+ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
|
||||
+ ps ps-am tags tags-am uninstall uninstall-am \
|
||||
+ uninstall-binPROGRAMS uninstall-binSCRIPTS \
|
||||
+ uninstall-libexecPROGRAMS uninstall-sbinSCRIPTS
|
||||
|
||||
|
||||
@HAVE_W32_SYSTEM_TRUE@.rc.o:
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: Utility for secure communication and data storage
|
||||
Name: gnupg2
|
||||
Version: 2.1.10
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
|
||||
License: GPLv3+
|
||||
Group: Applications/System
|
||||
@ -213,6 +213,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jan 13 2016 Dan Horák <dan[at]danny.cz> - 2.1.10-3
|
||||
- fix the insttools patch
|
||||
|
||||
* Wed Jan 13 2016 Tomáš Mráz <tmraz@redhat.com> - 2.1.10-2
|
||||
- rebase the insttools patch needed for full gpgv1 replacement
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user