From 526bc47a2aaf51c910a3a94a4820de8d1aad583b Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 29 Oct 2013 16:59:55 -0400 Subject: [PATCH] Update to 1.8.4.2 (#1024497) --- ...tree-Use-gitexecdir-instead-of-libexecdir.patch | 14 ++++++++------ git-1.5-gitweb-home-link.patch | 12 ------------ git-1.8-gitweb-home-link.patch | 12 ++++++++++++ git.spec | 9 ++++++--- sources | 6 +++--- 5 files changed, 29 insertions(+), 24 deletions(-) delete mode 100644 git-1.5-gitweb-home-link.patch create mode 100644 git-1.8-gitweb-home-link.patch diff --git a/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch b/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch index 73ae548..af57b28 100644 --- a/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch +++ b/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch @@ -1,4 +1,4 @@ -From 86c3e2b5188579bff1ff981910462ad5e563044b Mon Sep 17 00:00:00 2001 +From a906459c2a89938e911f1650e6ce22315a1ec84d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 4 Jan 2013 11:54:21 -0500 Subject: [PATCH] git-subtree: Use gitexecdir instead of libexecdir @@ -10,11 +10,11 @@ consistently. Remove the unused gitdir variable as well. --- - contrib/subtree/Makefile | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) + contrib/subtree/Makefile | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile -index 36ae3e4..f87b945 100644 +index 435b2de..dc8da19 100644 --- a/contrib/subtree/Makefile +++ b/contrib/subtree/Makefile @@ -2,9 +2,8 @@ @@ -28,15 +28,17 @@ index 36ae3e4..f87b945 100644 man1dir ?= $(mandir)/man1 gitver ?= $(word 3,$(shell git --version)) -@@ -30,7 +29,7 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH) +@@ -30,8 +29,8 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH) doc: $(GIT_SUBTREE_DOC) install: $(GIT_SUBTREE) +- $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir) - $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir) ++ $(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir) + $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(gitexecdir) install-doc: install-man -- -1.7.6 +1.8.3.1 diff --git a/git-1.5-gitweb-home-link.patch b/git-1.5-gitweb-home-link.patch deleted file mode 100644 index 74c8390..0000000 --- a/git-1.5-gitweb-home-link.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up git-1.7.2/gitweb/gitweb.perl.orig git-1.7.2/gitweb/gitweb.perl ---- git-1.7.2/gitweb/gitweb.perl.orig 2010-07-21 23:35:25.000000000 +0200 -+++ git-1.7.2/gitweb/gitweb.perl 2010-07-22 10:49:50.385707086 +0200 -@@ -79,7 +79,7 @@ our $projectroot = "++GITWEB_PROJECTROOT - our $project_maxdepth = "++GITWEB_PROJECT_MAXDEPTH++"; - - # string of the home link on top of all pages --our $home_link_str = "++GITWEB_HOME_LINK_STR++"; -+our $home_link_str = $ENV{'SERVER_NAME'} ? "git://" . $ENV{'SERVER_NAME'} : "projects"; - - # name of your site or organization to appear in page titles - # replace this with something more descriptive for clearer bookmarks diff --git a/git-1.8-gitweb-home-link.patch b/git-1.8-gitweb-home-link.patch new file mode 100644 index 0000000..aeb29e0 --- /dev/null +++ b/git-1.8-gitweb-home-link.patch @@ -0,0 +1,12 @@ +diff -up git-1.8.4.2/gitweb/gitweb.perl.orig git-1.8.4.2/gitweb/gitweb.perl +--- git-1.8.4.2/gitweb/gitweb.perl.orig 2013-10-28 14:17:38.000000000 -0400 ++++ git-1.8.4.2/gitweb/gitweb.perl 2013-10-29 16:49:07.302747507 -0400 +@@ -83,7 +83,7 @@ our $projectroot = "++GITWEB_PROJECTROOT + our $project_maxdepth = "++GITWEB_PROJECT_MAXDEPTH++"; + + # string of the home link on top of all pages +-our $home_link_str = "++GITWEB_HOME_LINK_STR++"; ++our $home_link_str = $ENV{'SERVER_NAME'} ? "git://" . $ENV{'SERVER_NAME'} : "projects"; + + # extra breadcrumbs preceding the home link + our @extra_breadcrumbs = (); diff --git a/git.spec b/git.spec index 6099b8f..e051bb8 100644 --- a/git.spec +++ b/git.spec @@ -50,8 +50,8 @@ %endif Name: git -Version: 1.8.3.1 -Release: 3%{?dist} +Version: 1.8.4.2 +Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -66,7 +66,7 @@ Source10: http://git-core.googlecode.com/files/%{name}-manpages-%{version} Source11: http://git-core.googlecode.com/files/%{name}-htmldocs-%{version}.tar.gz Source12: git.service Source13: git.socket -Patch0: git-1.5-gitweb-home-link.patch +Patch0: git-1.8-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/600411 @@ -641,6 +641,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue Oct 29 2013 Todd Zullinger - 1.8.4.2-1 +- Update to 1.8.4.2 (#1024497) + * Sat Oct 05 2013 Todd Zullinger - Add mercurial version requirement to git-hg, for those rebuilding on EL diff --git a/sources b/sources index 58aaa49..84b079d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -35401b410e7f248b13e35a1069aca2e2 git-1.8.3.1.tar.gz -bc031fe54e61c1635eba2b08341ece16 git-htmldocs-1.8.3.1.tar.gz -3f801cc82a58c2c2ceeab95975114113 git-manpages-1.8.3.1.tar.gz +6f63d103465b86ca0ebe4189ea54731c git-1.8.4.2.tar.gz +c76a6755d109bd2881da6813dac69153 git-htmldocs-1.8.4.2.tar.gz +2b4719ec820d845134b689247abe65e8 git-manpages-1.8.4.2.tar.gz