From 303956ba461a9390d0dfbdc30b51ba94439d0d6b Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 20 Oct 2011 17:01:35 +0200 Subject: [PATCH] Update to 1.7.7 - git-1.6-update-contrib-hooks-path.patch is no longer needed Signed-off-by: Adam Tkac --- .gitignore | 1 + git-1.6-update-contrib-hooks-path.patch | 43 ------------------------- git.spec | 11 ++++--- sources | 2 +- 4 files changed, 8 insertions(+), 49 deletions(-) delete mode 100644 git-1.6-update-contrib-hooks-path.patch diff --git a/.gitignore b/.gitignore index 7c90320..ec2e06e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /.build*.log /git-*/ /git-1.7.6.4.tar.gz +/git-1.7.7.tar.gz diff --git a/git-1.6-update-contrib-hooks-path.patch b/git-1.6-update-contrib-hooks-path.patch deleted file mode 100644 index a4220ad..0000000 --- a/git-1.6-update-contrib-hooks-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1963c852acc5d8c521a3e4f3b9ceb313d26a473c Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Mon, 22 Jun 2009 08:00:29 -0400 -Subject: [PATCH] Update path to contrib/hooks/post-receive-email - ---- - contrib/hooks/post-receive-email | 6 +++--- - templates/hooks--post-receive.sample | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email -index 2a66063..4835ada 100755 ---- a/contrib/hooks/post-receive-email -+++ b/contrib/hooks/post-receive-email -@@ -10,12 +10,12 @@ - # This hook is stored in the contrib/hooks directory. Your distribution - # will have put this somewhere standard. You should make this script - # executable then link to it in the repository you would like to use it in. --# For example, on debian the hook is stored in --# /usr/share/doc/git-core/contrib/hooks/post-receive-email: -+# For example, on fedora the hook is stored in -+# /usr/share/git-core/contrib/hooks/post-receive-email: - # - # chmod a+x post-receive-email - # cd /path/to/your/repository.git --# ln -sf /usr/share/doc/git-core/contrib/hooks/post-receive-email hooks/post-receive -+# ln -sf /usr/share/git-core/contrib/hooks/post-receive-email hooks/post-receive - # - # This hook script assumes it is enabled on the central repository of a - # project, with all users pushing only to it and not between each other. It -diff --git a/templates/hooks--post-receive.sample b/templates/hooks--post-receive.sample -index 18d2e0f..cf57878 100755 ---- a/templates/hooks--post-receive.sample -+++ b/templates/hooks--post-receive.sample -@@ -12,4 +12,4 @@ - # see contrib/hooks/ for a sample, or uncomment the next line and - # rename the file to "post-receive". - --#. /usr/share/doc/git-core/contrib/hooks/post-receive-email -+#. /usr/share/git-core/contrib/hooks/post-receive-email --- -1.6.3.2 - diff --git a/git.spec b/git.spec index 7e4df1e..c674273 100644 --- a/git.spec +++ b/git.spec @@ -68,8 +68,8 @@ %endif Name: git -Version: 1.7.6.4 -Release: 1%{?dist} +Version: 1.7.7 +Release: 0%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -88,8 +88,6 @@ Source6: gitweb.conf.in Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch -# https://bugzilla.redhat.com/500137 -Patch2: git-1.6-update-contrib-hooks-path.patch # https://bugzilla.redhat.com/600411 Patch3: git-1.7-el5-emacs-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -295,7 +293,6 @@ Requires: emacs-git = %{version}-%{release} %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %if %{emacs_old} %patch3 -p1 %endif @@ -534,6 +531,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Oct 20 2011 Adam Tkac - 1.7.7-1 +- update to 1.7.7 + - git-1.6-update-contrib-hooks-path.patch is no longer needed + * Mon Sep 26 2011 Adam Tkac - 1.7.6.4-1 - update to 1.7.6.4 diff --git a/sources b/sources index c12a311..370af69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0b7afcc0e5e43bbb82f85598ae34bd8 git-1.7.6.4.tar.gz +5d645884e688921e773186783b65ce33 git-1.7.7.tar.gz