diff --git a/git/git.patch b/git/git.patch index 72e2176c6d..1dda137707 100644 --- a/git/git.patch +++ b/git/git.patch @@ -1,7 +1,7 @@ Index: Documentation/Makefile ---- Documentation/Makefile.orig 2020-10-29 23:11:30.000000000 +0100 -+++ Documentation/Makefile 2020-10-30 14:50:38.289596000 +0100 -@@ -141,12 +141,12 @@ +--- Documentation/Makefile.orig 2021-11-15 08:28:57.000000000 +0100 ++++ Documentation/Makefile 2021-11-15 22:12:05.586982000 +0100 +@@ -153,12 +153,12 @@ MAKEINFO = makeinfo INSTALL_INFO = install-info @@ -17,9 +17,9 @@ Index: Documentation/Makefile -include ../config.mak.autogen Index: Makefile ---- Makefile.orig 2020-10-29 23:11:30.000000000 +0100 -+++ Makefile 2020-10-30 14:51:54.547291000 +0100 -@@ -524,15 +524,15 @@ +--- Makefile.orig 2021-11-15 08:28:57.000000000 +0100 ++++ Makefile 2021-11-15 22:31:29.998433000 +0100 +@@ -517,15 +517,15 @@ prefix = $(HOME) bindir = $(prefix)/bin @@ -38,21 +38,21 @@ Index: Makefile htmldir = $(prefix)/share/doc/git-doc ETC_GITCONFIG = $(sysconfdir)/gitconfig ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes -@@ -2929,6 +2929,11 @@ - $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' +@@ -3016,6 +3016,11 @@ $(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)' + $(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)' + $(INSTALL) $(BINDIR_PROGRAMS_NO_X) '$(DESTDIR_SQ)$(bindir_SQ)' + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(prefix)/lib' + $(INSTALL) -m 644 $(LIB_FILE) '$(DESTDIR_SQ)$(prefix)/lib/libgit.a' + $(INSTALL) -m 644 $(XDIFF_LIB) '$(DESTDIR_SQ)$(prefix)/lib/libgit-xdiff.a' + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(prefix)/include/git' + for h in $(LIB_H); do b=`echo $$h | sed -e 's;/*[^/][^/]*$$;;'`; $(INSTALL) -d -m 755 $(DESTDIR_SQ)$(prefix)/include/git/$$b; $(INSTALL) -m 644 $$h $(DESTDIR_SQ)$(prefix)/include/git/$$h; done + ifdef MSVC # We DO NOT install the individual foo.o.pdb files because they - # have already been rolled up into the exe's pdb file. Index: config.mak.in ---- config.mak.in.orig 2020-10-29 23:11:30.000000000 +0100 -+++ config.mak.in 2020-10-30 14:50:38.290142000 +0100 +--- config.mak.in.orig 2021-11-15 08:28:57.000000000 +0100 ++++ config.mak.in 2021-11-15 22:12:05.587629000 +0100 @@ -14,9 +14,9 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -66,8 +66,8 @@ Index: config.mak.in docdir = @docdir@ Index: templates/Makefile ---- templates/Makefile.orig 2020-10-29 23:11:30.000000000 +0100 -+++ templates/Makefile 2020-10-30 14:50:38.290270000 +0100 +--- templates/Makefile.orig 2021-11-15 08:28:57.000000000 +0100 ++++ templates/Makefile 2021-11-15 22:12:05.587737000 +0100 @@ -8,7 +8,7 @@ TAR ?= tar RM ?= rm -f diff --git a/git/git.spec b/git/git.spec index 5efce34cbf..15d1a05c1e 100644 --- a/git/git.spec +++ b/git/git.spec @@ -31,8 +31,8 @@ Distribution: OpenPKG Community Class: BASE Group: SCM License: GPL -Version: 2.33.1 -Release: 20211013 +Version: 2.34.0 +Release: 20211115 # package options %option with_doc no