[gitolite] 2.3.1.

[Jon Ciesla]

commit 17c413c48ecd7e117304aea5a5af5156f88757bd
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon May 21 09:46:08 2012 -0500

    2.3.1.

 gitolite-2.0-rpm.patch |   70 ++++++++++++++++-------------------------------
 gitolite.spec          |   16 +++++++----
 2 files changed, 34 insertions(+), 52 deletions(-)
---
diff --git a/gitolite-2.0-rpm.patch b/gitolite-2.0-rpm.patch
index ac77a71..c7a2490 100644
--- a/gitolite-2.0-rpm.patch
+++ b/gitolite-2.0-rpm.patch
@@ -1,49 +1,3 @@
-diff -ur sitaramc-gitolite-4c1e4b2.orig/conf/example.gitolite.rc sitaramc-gitolite-4c1e4b2/conf/example.gitolite.rc
---- sitaramc-gitolite-4c1e4b2.orig/conf/example.gitolite.rc	2011-08-08 00:17:56.000000000 -0400
-+++ sitaramc-gitolite-4c1e4b2/conf/example.gitolite.rc	2011-08-08 14:08:05.969544341 -0400
-@@ -19,8 +19,8 @@
- # DO NOT CHANGE THE NEXT FOUR LINES UNLESS YOU REALLY KNOW WHAT YOU'RE DOING.
- # These variables are set automatically by the install method you choose.
- #            (PACKAGE MAINTAINERS: PLEASE READ doc/packaging.mkd)
--# $GL_PACKAGE_CONF = "";
--# $GL_PACKAGE_HOOKS = "";
-+$GL_PACKAGE_CONF = "/usr/share/gitolite/conf";
-+$GL_PACKAGE_HOOKS = "/usr/share/gitolite/hooks";
- 
- # ------------------------------------------------------------------------------
- # most often used/changed variables
-diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gl-install sitaramc-gitolite-4c1e4b2/src/gl-install
---- sitaramc-gitolite-4c1e4b2.orig/src/gl-install	2011-08-08 00:17:56.000000000 -0400
-+++ sitaramc-gitolite-4c1e4b2/src/gl-install	2011-08-08 14:12:09.177505993 -0400
-@@ -63,7 +63,7 @@
- wrap_mkdir($REPO_BASE);
- wrap_mkdir($GL_ADMINDIR, 0700);
- # mkdir $GL_ADMINDIR's subdirs
--for my $dir (qw(conf doc keydir logs src hooks hooks/common hooks/gitolite-admin)) {
-+for my $dir (qw(conf keydir logs hooks hooks/common hooks/gitolite-admin)) {
-     # some of them will stay empty; too lazy to fix right now ;-)
-     wrap_mkdir("$GL_ADMINDIR/$dir", 0700);
- }
-@@ -84,7 +84,7 @@
-                 RW+     =   yourname
-     2.  copy "yourname.pub" to $GL_ADMINDIR/keydir
-     3.  run this command
--            $GL_ADMINDIR/src/gl-compile-conf
-+            gl-compile-conf
- EOF
- }
- 
---- sitaramc-gitolite-4c1e4b2/src/gl-setup~	2011-11-17 08:28:51.000000000 -0600
-+++ sitaramc-gitolite-4c1e4b2/src/gl-setup	2011-11-17 08:30:08.665150377 -0600
-@@ -21,7 +21,7 @@
- die() { echo "$@" >&2; exit 1; }
- 
- get_rc_val() {
--    `dirname $0`/gl-query-rc $1
-+    /usr/bin/gl-query-rc $1
- }
- 
- TEMPDIR=`mktemp -d -t tmp.XXXXXXXXXX`
 --- sitaramc-gitolite-4c1e4b2/src/gl-setup~	2011-11-17 08:31:44.000000000 -0600
 +++ sitaramc-gitolite-4c1e4b2/src/gl-setup	2011-11-17 08:33:07.782544479 -0600
 @@ -1,6 +1,6 @@
@@ -54,3 +8,27 @@ diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gl-install sitaramc-gitolite-4c1e4b2
  # must be the same as the value for the same variable in
  # $GL_PACKAGE_CONF/example.gitolite.rc.  Sorry about the catch-22 :)
  
+--- sitaramc-gitolite-4c1e4b2/src/gl-setup~	2012-05-21 09:29:44.000000000 -0500
++++ sitaramc-gitolite-4c1e4b2/src/gl-setup	2012-05-21 09:33:47.830855218 -0500
+@@ -25,7 +25,7 @@
+ die() { echo "$@" >&2; exit 1; }
+ 
+ get_rc_val() {
+-    `dirname $0`/gl-query-rc $1
++    /usr/bin/gl-query-rc $1
+ }
+ 
+ # ----------------------------------------------------------------------
+--- sitaramc-gitolite-bdbf84e/conf/example.gitolite.rc~	2012-05-13 23:58:58.000000000 -0500
++++ sitaramc-gitolite-bdbf84e/conf/example.gitolite.rc	2012-05-21 09:35:01.446764982 -0500
+@@ -19,8 +19,8 @@
+ # DO NOT CHANGE THE NEXT FOUR LINES UNLESS YOU REALLY KNOW WHAT YOU'RE DOING.
+ # These variables are set automatically by the install method you choose.
+ #            (PACKAGE MAINTAINERS: PLEASE READ doc/packaging.mkd)
+-$GL_PACKAGE_CONF = "/tmp/share/gitolite/conf";
+-$GL_PACKAGE_HOOKS = "/tmp/share/gitolite/hooks";
++$GL_PACKAGE_CONF = "/usr/share/gitolite/conf";
++$GL_PACKAGE_HOOKS = "/usr/share/gitolite/hooks";
+ 
+ # ------------------------------------------------------------------------------
+ # most often used/changed variables
diff --git a/gitolite.spec b/gitolite.spec
index 80af0a6..38ec48a 100644
--- a/gitolite.spec
+++ b/gitolite.spec
@@ -7,8 +7,8 @@
 %endif
 
 Name:           gitolite
-Version:        2.3
-Release:        2%{?dist}
+Version:        2.3.1
+Release:        1%{?dist}
 Summary:        Highly flexible server for git directory version tracker
 
 Group:          Applications/System
@@ -20,13 +20,13 @@ URL:            http://github.com/sitaramc/gitolite
 # $ cd gitolite
 # $ git archive ed2bf5 |gzip >gitolite-ed2bf5.tar.gz
 #Source0:        gitolite-ed2bf5.tar.gz
-Source0:        sitaramc-gitolite-v2.3-0-g01e789a.tar.gz
+Source0:        sitaramc-gitolite-v2.3.1-0-g912a8bd.tar.gz
 Source1:        gitolite-README-fedora
 # Far from being upstreamable
 Patch0:         gitolite-2.0-rpm.patch
 #Patch1:         gitolite-1.4.2-conf.patch
 #Patch2:         adcfix.post-v2.patch
-Patch3:		gitolite-2.3-configgen.patch
+#Patch3:		gitolite-2.3-configgen.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
@@ -53,12 +53,12 @@ elsewhere in the doc/ directory.
 
 
 %prep
-%setup -qn sitaramc-gitolite-6857652
+%setup -qn sitaramc-gitolite-bdbf84e
 # Don't create backups; would mess with %%install
 %patch0 -p1
 #%patch1 -p1
 #%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
 cp %{SOURCE1} .
 
 
@@ -120,6 +120,10 @@ exit 0
 
 
 %changelog
+* Mon May 21 2012 Jon Ciesla <limburgher at gmail.com> - 2.3.1-1
+- 2.3.1.
+- configgen patch upstreamed.
+
 * Fri Mar 23 2012 Jon Ciesla <limburgher at gmail.com> - 2.3-2
 - Patch for hook propagation, BZ 798051.