diff --git a/git/git.patch b/git/git.patch index 822554ae57..4031e242f6 100644 --- a/git/git.patch +++ b/git/git.patch @@ -37,9 +37,9 @@ Index: gc-utils/doc/Makefile endif uninstall: -Index: git-1.7.10.3/Documentation/Makefile ---- git-1.7.10.3/Documentation/Makefile.orig 2012-01-27 21:51:04.000000000 +0100 -+++ git-1.7.10.3/Documentation/Makefile 2012-01-29 11:12:42.000000000 +0100 +Index: git-1.7.10.4/Documentation/Makefile +--- git-1.7.10.4/Documentation/Makefile.orig 2012-01-27 21:51:04.000000000 +0100 ++++ git-1.7.10.4/Documentation/Makefile 2012-01-29 11:12:42.000000000 +0100 @@ -56,10 +56,10 @@ infodir?=$(prefix)/share/info MAKEINFO=makeinfo @@ -53,9 +53,9 @@ Index: git-1.7.10.3/Documentation/Makefile endif -include ../config.mak.autogen -Index: git-1.7.10.3/Makefile ---- git-1.7.10.3/Makefile.orig 2012-01-27 21:51:04.000000000 +0100 -+++ git-1.7.10.3/Makefile 2012-01-29 11:12:42.000000000 +0100 +Index: git-1.7.10.4/Makefile +--- git-1.7.10.4/Makefile.orig 2012-01-27 21:51:04.000000000 +0100 ++++ git-1.7.10.4/Makefile 2012-01-29 11:12:42.000000000 +0100 @@ -324,12 +324,12 @@ bindir = $(prefix)/$(bindir_relative) mandir = share/man @@ -98,9 +98,9 @@ Index: git-1.7.10.3/Makefile $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)' $(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)' -Index: git-1.7.10.3/config.mak.in ---- git-1.7.10.3/config.mak.in.orig 2012-01-27 21:51:04.000000000 +0100 -+++ git-1.7.10.3/config.mak.in 2012-01-29 11:12:42.000000000 +0100 +Index: git-1.7.10.4/config.mak.in +--- git-1.7.10.4/config.mak.in.orig 2012-01-27 21:51:04.000000000 +0100 ++++ git-1.7.10.4/config.mak.in 2012-01-29 11:12:42.000000000 +0100 @@ -15,9 +15,9 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -113,9 +113,9 @@ Index: git-1.7.10.3/config.mak.in sysconfdir = @sysconfdir@ mandir=@mandir@ -Index: git-1.7.10.3/perl/Makefile.PL ---- git-1.7.10.3/perl/Makefile.PL.orig 2012-01-27 21:51:04.000000000 +0100 -+++ git-1.7.10.3/perl/Makefile.PL 2012-01-29 11:12:42.000000000 +0100 +Index: git-1.7.10.4/perl/Makefile.PL +--- git-1.7.10.4/perl/Makefile.PL.orig 2012-01-27 21:51:04.000000000 +0100 ++++ git-1.7.10.4/perl/Makefile.PL 2012-01-29 11:12:42.000000000 +0100 @@ -46,5 +46,6 @@ PM => \%pm, PM_FILTER => qq[\$(PERL) -pe "s<\\Q++LOCALEDIR++\\E><$localedir>"], @@ -124,9 +124,9 @@ Index: git-1.7.10.3/perl/Makefile.PL + INSTALLDIRS => 'vendor', + INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3' ); -Index: git-1.7.10.3/sha1_file.c ---- git-1.7.10.3/sha1_file.c.orig 2012-01-27 21:51:04.000000000 +0100 -+++ git-1.7.10.3/sha1_file.c 2012-01-29 11:12:42.000000000 +0100 +Index: git-1.7.10.4/sha1_file.c +--- git-1.7.10.4/sha1_file.c.orig 2012-01-27 21:51:04.000000000 +0100 ++++ git-1.7.10.4/sha1_file.c 2012-01-29 11:12:42.000000000 +0100 @@ -19,6 +19,7 @@ #include "pack-revindex.h" #include "sha1-lookup.h" @@ -135,9 +135,9 @@ Index: git-1.7.10.3/sha1_file.c #ifndef O_NOATIME #if defined(__linux__) && (defined(__i386__) || defined(__PPC__)) -Index: git-1.7.10.3/templates/Makefile ---- git-1.7.10.3/templates/Makefile.orig 2012-01-27 21:51:04.000000000 +0100 -+++ git-1.7.10.3/templates/Makefile 2012-01-29 11:12:42.000000000 +0100 +Index: git-1.7.10.4/templates/Makefile +--- git-1.7.10.4/templates/Makefile.orig 2012-01-27 21:51:04.000000000 +0100 ++++ git-1.7.10.4/templates/Makefile 2012-01-29 11:12:42.000000000 +0100 @@ -8,7 +8,7 @@ TAR ?= tar RM ?= rm -f diff --git a/git/git.spec b/git/git.spec index 9ccfe89e22..88029b6f94 100644 --- a/git/git.spec +++ b/git/git.spec @@ -22,7 +22,7 @@ ## # package version -%define V_git 1.7.10.3 +%define V_git 1.7.10.4 %define V_cogito 0.18.2 %define V_stgit 0.14.3 %define V_guilt 0.35 @@ -40,7 +40,7 @@ Class: EVAL Group: SCM License: GPL Version: %{V_git} -Release: 20120526 +Release: 20120605 # package options %option with_doc no