From 04ac13548f3cdf86a6a26366fd80ef88b659b608 Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limburgher@gmail.com>
Date: Feb 16 2012 14:49:01 +0000
Subject: Update to 2.3, better version handling.


---

diff --git a/.gitignore b/.gitignore
index 8cad807..c7b4f1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ sitaramc-gitolite-v1.5.4-0-g0d0e7e5.tar.gz
 /sitaramc-gitolite-v2.1-0-g871ed28.tar.gz
 /sitaramc-gitolite-v2.2-0-g15b17d7.tar.gz
 /sitaramc-gitolite-v2.2.1-0-gbd789c0.tar.gz
+/sitaramc-gitolite-v2.3-0-g01e789a.tar.gz
diff --git a/gitolite-2.0-rpm.patch b/gitolite-2.0-rpm.patch
index 38541a1..ac77a71 100644
--- a/gitolite-2.0-rpm.patch
+++ b/gitolite-2.0-rpm.patch
@@ -33,20 +33,6 @@ diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gl-install sitaramc-gitolite-4c1e4b2
  EOF
  }
  
---- 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 @@
-     chomp($gl_version);
-     my $git_version = `git --version`;
-     $git_version =~ s/^git version //;
--    print "hello $user, this is gitolite $gl_version running on git $git_version";
-+    print "hello $user, this is gitolite ";
-+    system("rpm", "-q", "--qf", '%{version}-%{release}', 'gitolite');
-+    print " running on git ";
-+    system("rpm", "-q", "--qf", '%{version}-%{release}', 'git');
- }
- 
- 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 @@
@@ -68,16 +54,3 @@ 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-b761c46/src/gitolite.pm~	2012-01-24 08:39:05.000000000 -0600
-+++ sitaramc-gitolite-b761c46/src/gitolite.pm	2012-01-24 08:42:51.156624271 -0600
-@@ -557,8 +557,8 @@
- 
- sub report_version {
-     my($user) = @_;
--    my $gl_version = slurp( ($GL_PACKAGE_CONF || "$GL_ADMINDIR/conf") . "/VERSION" );
--    chomp($gl_version);
-+    #my $gl_version = slurp( ($GL_PACKAGE_CONF || "$GL_ADMINDIR/conf") . "/VERSION" );
-+    #chomp($gl_version);
-     my $git_version = `git --version`;
-     $git_version =~ s/^git version //;
-     print "hello $user, this is gitolite ";
diff --git a/gitolite.spec b/gitolite.spec
index bdd2845..bd8a5bf 100644
--- a/gitolite.spec
+++ b/gitolite.spec
@@ -7,8 +7,8 @@
 %endif
 
 Name:           gitolite
-Version:        2.2.1
-Release:        2%{?dist}
+Version:        2.3
+Release:        1%{?dist}
 Summary:        Highly flexible server for git directory version tracker
 
 Group:          Applications/System
@@ -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.2.1-0-gbd789c0.tar.gz
+Source0:        sitaramc-gitolite-v2.3-0-g01e789a.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-b761c46
+%setup -qn sitaramc-gitolite-6857652
 # Don't create backups; would mess with %%install
 %patch0 -p1
 #%patch1 -p1
@@ -85,6 +85,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -p src/gl-* $RPM_BUILD_ROOT%{_bindir}
 install -p src/sshkeys-lint $RPM_BUILD_ROOT%{_bindir}
 install -p -m644 src/*.pm $RPM_BUILD_ROOT%{perl_vendorlib}
+echo "%{version}-%{release}" >conf/VERSION
 cp -a conf hooks $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # empty authorized_keys file
@@ -117,6 +118,11 @@ exit 0
 
 
 %changelog
+* Thu Feb 16 2012 Jon Ciesla <limburgher@gmail.com> - 2.3-1
+- Created VERSION at build time.
+- Stop calling rpm to get version.
+- Update to 2.3.
+
 * Tue Jan 24 2012 Jon Ciesla <limburgher@gmail.com> - 2.2.1-2
 - Include sshkeys-lint.  Thanks Mukund Sivaraman!
 - Patched to prevent abort at version check, BZ 781589.
diff --git a/sources b/sources
index 05aa74c..c403f13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ad2611deab29f65d1c033d17b5fda38  sitaramc-gitolite-v2.2.1-0-gbd789c0.tar.gz
+9d213f1c0d73e33be779b2735d7b9552  sitaramc-gitolite-v2.3-0-g01e789a.tar.gz