packages: gitolite/gitolite.spec, gitolite/gitolite-gituser.patch (NEW) - p...

[draenog]

Author: draenog                      Date: Tue May 17 11:52:58 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patch from gitolite to set git user and email configuration
- move not necessary hooks in docdir

---- Files affected:
packages/gitolite:
   gitolite.spec (1.24 -> 1.25) , gitolite-gituser.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gitolite/gitolite.spec
diff -u packages/gitolite/gitolite.spec:1.24 packages/gitolite/gitolite.spec:1.25
--- packages/gitolite/gitolite.spec:1.24	Tue May 17 13:04:39 2011
+++ packages/gitolite/gitolite.spec	Tue May 17 13:52:53 2011
@@ -14,6 +14,7 @@
 # Source0-md5:	f960fa5794193e1c77bfb14aa2b872ea
 Patch0:		%{name}-mkdir.patch
 Patch1:		%{name}-env.patch
+Patch2:		%{name}-gituser.patch
 URL:		http://github.com/sitaramc/gitolite
 BuildRequires:	perl-Text-Markdown
 BuildRequires:	rpm-perlprov
@@ -63,6 +64,7 @@
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 rm src/gl-system-install
 
@@ -90,14 +92,15 @@
 cp -p conf/{example.gitolite.rc,VERSION} $RPM_BUILD_ROOT%{_sysconfdir}/gitolite
 cp -a hooks/* $RPM_BUILD_ROOT%{_datadir}/gitolite/hooks
 
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/gitolite/hooks/common/gl-pre-git.hub-sample
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/gitolite/hooks/common/{gl-pre-git.hub-sample,update.secondary.sample,post-receive.mirrorpush}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.mkd conf/example.conf hooks/common/gl-pre-git.hub-sample
+%doc README.mkd conf/example.conf hooks/common/{gl-pre-git.hub-sample,update.secondary.sample,post-receive.mirrorpush}
+
 %dir %{_sysconfdir}/gitolite
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gitolite/example.gitolite.rc
 %{_sysconfdir}/gitolite/VERSION
@@ -109,7 +112,6 @@
 %dir %{_datadir}/gitolite/hooks/common
 %dir %{_datadir}/gitolite/hooks/gitolite-admin
 %attr(755,root,root) %{_datadir}/gitolite/hooks/common/gitolite-hooked
-%attr(755,root,root) %{_datadir}/gitolite/hooks/common/post-receive.mirrorpush
 %attr(755,root,root) %{_datadir}/gitolite/hooks/common/update
 %attr(755,root,root) %{_datadir}/gitolite/hooks/gitolite-admin/post-update
 
@@ -123,6 +125,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2011/05/17 11:52:53  draenog
+- patch from gitolite to set git user and email configuration
+- move not necessary hooks in docdir
+
 Revision 1.24  2011/05/17 11:04:39  draenog
 - up to 2.0.1
 

================================================================
Index: packages/gitolite/gitolite-gituser.patch
diff -u /dev/null packages/gitolite/gitolite-gituser.patch:1.1
--- /dev/null	Tue May 17 13:52:58 2011
+++ packages/gitolite/gitolite-gituser.patch	Tue May 17 13:52:53 2011
@@ -0,0 +1,38 @@
+commit 836faf915fbfc28ab5447d6f4d2ab1c7e7726eec
+Author: Sitaram Chamarty <sitaram at atc.tcs.com>
+Date:   Wed May 4 13:57:39 2011 +0530
+
+    forcibly set user.{name,email} if needed
+    
+    git 1.7.4+ insists on these two being defined.  So I reduce my support
+    load by forcing them if they were not set.
+    
+    Much easier than explaining to people what should be obvious from the
+    error message.
+
+diff --git a/src/gl-easy-install b/src/gl-easy-install
+index 2f8a128..7b6b062 100755
+--- a/src/gl-easy-install
++++ b/src/gl-easy-install
+@@ -440,6 +440,8 @@ setup_pta() {
+ 
+     echo "cd $REPO_BASE/gitolite-admin.git
+ PATH=\$PATH:$GIT_PATH
++git config --get user.email || git config user.email \$USER@\`hostname\`
++git config --get user.name  || git config user.name  \"\$USER on \`hostname\`\"
+ GIT_WORK_TREE=$GL_ADMINDIR git add conf/gitolite.conf keydir
+ GIT_WORK_TREE=$GL_ADMINDIR git diff --cached --quiet 2>/dev/null || GIT_WORK_TREE=$GL_ADMINDIR git commit -am start
+ " | ssh -T $p_port $user@$host
+diff --git a/src/gl-setup b/src/gl-setup
+index fd8357b..be69315 100755
+--- a/src/gl-setup
++++ b/src/gl-setup
+@@ -128,6 +128,8 @@ gl-compile-conf -q
+     cd $HOME; cd $REPO_BASE/gitolite-admin.git
+     GIT_WORK_TREE=$GL_ADMINDIR; export GIT_WORK_TREE
+     git add conf/gitolite.conf keydir
++    git config --get user.email || git config user.email $USER@`hostname`
++    git config --get user.name  || git config user.name  "$USER on `hostname`"
+     git diff --cached --quiet 2>/dev/null || git commit -am start
+ )
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gitolite/gitolite.spec?r1=1.24&r2=1.25&f=u