rpms/git/devel git-1.6-update-contrib-hooks-path.patch, NONE, 1.1 .cvsignore, 1.75, 1.76 git.spec, 1.86, 1.87 sources, 1.75, 1.76 git-1.6.3.2-daemon-extra-args.patch, 1.1, NONE

Sun Jun 28 23:26:41 UTC 2009

Author: tmz

Update of /cvs/pkgs/rpms/git/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18541

Modified Files:
	.cvsignore git.spec sources 
Added Files:
	git-1.6-update-contrib-hooks-path.patch 
Removed Files:
	git-1.6.3.2-daemon-extra-args.patch 
Log Message:
Update to git-1.6.3.3

- Move contributed hooks to %{_datadir}/git-core/contrib/hooks (bug 500137)


git-1.6-update-contrib-hooks-path.patch:

--- NEW FILE git-1.6-update-contrib-hooks-path.patch ---
>From 1963c852acc5d8c521a3e4f3b9ceb313d26a473c Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
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 an 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/.cvsignore,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- .cvsignore	6 Jun 2009 01:45:16 -0000	1.75
+++ .cvsignore	28 Jun 2009 23:26:09 -0000	1.76
@@ -1 +1 @@
-git-1.6.3.2.tar.bz2
+git-1.6.3.3.tar.bz2


Index: git.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/git.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- git.spec	20 Jun 2009 00:52:46 -0000	1.86
+++ git.spec	28 Jun 2009 23:26:09 -0000	1.87
@@ -1,8 +1,8 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        1.6.3.2
-Release:        3%{?dist}
-Summary:        Core git tools
+Version:        1.6.3.3
+Release:        1%{?dist}
+Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
 URL:            http://git-scm.com/
@@ -14,8 +14,8 @@ Source4:        git-gui.desktop
 Patch0:         git-1.5-gitweb-home-link.patch
 # https://bugzilla.redhat.com/490602
 Patch1:         git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
-# http://git.kernel.org/?p=git/git.git;a=commitdiff;h=73bb33a9
-Patch2:         git-1.6.3.2-daemon-extra-args.patch
+# https://bugzilla.redhat.com/500137
+Patch2:         git-1.6-update-contrib-hooks-path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -203,6 +203,17 @@ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT
      htmldir=%{_docdir}/%{name}-%{version} \\\
      prefix=%{_prefix}
 
+# Filter bogus perl requires
+# packed-refs comes from a comment in contrib/hooks/update-paranoid
+cat << \EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} $* |\
+sed -e '/perl(packed-refs)/d'
+EOF
+
+%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+chmod +x %{__perl_requires}
+
 %build
 %{make_git} all %{!?_without_docs: doc}
 
@@ -257,6 +268,14 @@ install -pm 0644 %{SOURCE2} $RPM_BUILD_R
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git
 
+# Move contrib/hooks out of %%docdir and make them executable
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/git-core/contrib
+mv contrib/hooks $RPM_BUILD_ROOT%{_datadir}/git-core/contrib
+chmod +x $RPM_BUILD_ROOT%{_datadir}/git-core/contrib/hooks/*
+pushd contrib > /dev/null
+ln -s ../../../git-core/contrib/hooks
+popd > /dev/null
+
 # install git-gui .desktop file
 desktop-file-install \
 %if 0%{?rhel} && 0%{?rhel} <= 5
@@ -266,6 +285,7 @@ desktop-file-install \
 
 # quiet some rpmlint complaints
 chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/*
+chmod a-x $RPM_BUILD_ROOT%{_libexecdir}/git-core/git-mergetool--lib
 rm -f {Documentation/technical,contrib/emacs}/.gitignore
 chmod a-x Documentation/technical/api-index.sh
 find contrib -type f -perm /a+x | xargs chmod -x
@@ -366,6 +386,11 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Sun Jun 28 2009 Todd Zullinger <tmz at pobox.com> - 1.6.3.3-1
+- git-1.6.3.3
+- Move contributed hooks to %%{_datadir}/git-core/contrib/hooks (bug 500137)
+- Fix rpmlint warnings about Summary and git-mergetool--lib missing shebang
+
 * Fri Jun 19 2009 Todd Zullinger <tmz at pobox.com> - 1.6.3.2-3
 - Temporarily disable asciidoc's safe mode until bug 506953 is fixed
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/git/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	6 Jun 2009 01:45:16 -0000	1.75
+++ sources	28 Jun 2009 23:26:09 -0000	1.76
@@ -1 +1 @@
-149948ff33fb7d8cf9eef925e6c08157  git-1.6.3.2.tar.bz2
+91ae46ac01dadab1962beb064abd5b60  git-1.6.3.3.tar.bz2


--- git-1.6.3.2-daemon-extra-args.patch DELETED ---


