[gitolite] 2.2.

[Jon Ciesla]

commit 56731d8fc8a38c94544e92e02038a99fff54679b
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Nov 17 08:39:49 2011 -0600

    2.2.

 .gitignore             |    1 +
 gitolite-2.0-rpm.patch |   41 +++++++++++++++++++++--------------------
 gitolite.spec          |    9 ++++++---
 sources                |    2 +-
 4 files changed, 29 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index abc0c57..7103ca9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ sitaramc-gitolite-v1.5.4-0-g0d0e7e5.tar.gz
 /sitaramc-gitolite-v2.0.2-0-g436662f.tar.gz
 /sitaramc-gitolite-v2.0.3-0-g4c1e4b2.tar.gz
 /sitaramc-gitolite-v2.1-0-g871ed28.tar.gz
+/sitaramc-gitolite-v2.2-0-g15b17d7.tar.gz
diff --git a/gitolite-2.0-rpm.patch b/gitolite-2.0-rpm.patch
index 573fda9..93eb7e3 100644
--- a/gitolite-2.0-rpm.patch
+++ b/gitolite-2.0-rpm.patch
@@ -33,26 +33,6 @@ diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gl-install sitaramc-gitolite-4c1e4b2
  EOF
  }
  
-diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gl-setup sitaramc-gitolite-4c1e4b2/src/gl-setup
---- sitaramc-gitolite-4c1e4b2.orig/src/gl-setup	2011-08-08 00:17:56.000000000 -0400
-+++ sitaramc-gitolite-4c1e4b2/src/gl-setup	2011-08-08 14:02:56.240514168 -0400
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--GL_PACKAGE_CONF=/tmp/share/gitolite/conf
-+GL_PACKAGE_CONF=/usr/share/gitolite/conf
- # must be the same as the value for the same variable in
- # $GL_PACKAGE_CONF/example.gitolite.rc.  Sorry about the catch-22 :)
- 
-@@ -21,7 +21,7 @@
- die() { echo "$@"; exit 1; } >&2
- 
- get_rc_val() {
--    ${0%/*}/gl-query-rc $1
-+    /usr/bin/gl-query-rc $1
- }
- 
- TEMPDIR=$(mktemp -d -t tmp.XXXXXXXXXX)
 --- sitaramc-gitolite-4c1e4b2/src/gitolite.pm~	2011-09-28 21:03:53.000000000 -0500
 +++ sitaramc-gitolite-4c1e4b2/src/gitolite.pm	2011-10-01 11:46:53.000000000 -0500
 @@ -516,7 +516,10 @@
@@ -67,3 +47,24 @@ diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gl-setup sitaramc-gitolite-4c1e4b2/s
  }
  
  sub perm_code {
+--- 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 @@
+ #!/bin/sh
+ 
+-GL_PACKAGE_CONF=/tmp/share/gitolite/conf
++GL_PACKAGE_CONF=/usr/share/gitolite/conf
+ # must be the same as the value for the same variable in
+ # $GL_PACKAGE_CONF/example.gitolite.rc.  Sorry about the catch-22 :)
+ 
diff --git a/gitolite.spec b/gitolite.spec
index 4fc278e..1c8991d 100644
--- a/gitolite.spec
+++ b/gitolite.spec
@@ -7,7 +7,7 @@
 %endif
 
 Name:           gitolite
-Version:        2.1
+Version:        2.2
 Release:        1%{?dist}
 Summary:        Highly flexible server for git directory version tracker
 
@@ -20,7 +20,7 @@ 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.1-0-g871ed28.tar.gz
+Source0:        sitaramc-gitolite-v2.2-0-g15b17d7.tar.gz
 Source1:        gitolite-README-fedora
 # Far from being upstreamable
 Patch0:         gitolite-2.0-rpm.patch
@@ -52,7 +52,7 @@ elsewhere in the doc/ directory.
 
 
 %prep
-%setup -qn sitaramc-gitolite-871ed28
+%setup -qn sitaramc-gitolite-0ffadc1
 # Don't create backups; would mess with %%install
 %patch0 -p1
 #%patch1 -p1
@@ -116,6 +116,9 @@ exit 0
 
 
 %changelog
+* Thu Nov 17 2011 Jon Ciesla <limb at jcomserv.net> - 2.2-1
+- 2.2.
+
 * Fri Sep 30 2011 Jon Ciesla <limb at jcomserv.net> - 2.1-1
 - 2.1.
 - Updated README to warn admins about variables that
diff --git a/sources b/sources
index 566abb1..3aa1c7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33e0f6f384cf0596aed974fa563b50c3  sitaramc-gitolite-v2.1-0-g871ed28.tar.gz
+9b8db827914cdaf74023bd13ed431563  sitaramc-gitolite-v2.2-0-g15b17d7.tar.gz