[gitolite/el5] Fix version handling.

[Jon Ciesla]

commit 271c419204aa3bc2e8d220455d52459e4af79dee
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Feb 17 09:22:21 2012 -0600

    Fix version handling.

 gitolite-1.5.9-rpm.patch |    9 ---------
 gitolite.spec            |    6 +++++-
 2 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/gitolite-1.5.9-rpm.patch b/gitolite-1.5.9-rpm.patch
index 2dbb11a..8a9ec86 100644
--- a/gitolite-1.5.9-rpm.patch
+++ b/gitolite-1.5.9-rpm.patch
@@ -93,15 +93,6 @@ diff -U3 -r sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gl-setup sitaramc-gitol
      ln_sf("$GL_PACKAGE_HOOKS/common", "*", "$repo/hooks") if $GL_PACKAGE_HOOKS;
 --- sitaramc-gitolite-v1.4.2-0-g820d3f5.orig/src/gitolite.pm~	2011-02-12 09:25:34.000000000 -0600
 +++ sitaramc-gitolite-v1.4.2-0-g820d3f5/src/gitolite.pm	2011-02-14 10:40:29.791797001 -0600
-@@ -460,7 +460,7 @@
- sub report_version {
-     my($user) = @_;
-     print "hello $user, the gitolite version here is ";
--    system("cat", ($GL_PACKAGE_CONF || "$GL_ADMINDIR/conf") . "/VERSION");
-+    system("rpm", "-q", "--qf", '%{version}-%{release}', 'gitolite');
- }
- 
- sub perm_code {
 @@ -876,7 +876,7 @@
      # LOCAL CONSTANTS
  
diff --git a/gitolite.spec b/gitolite.spec
index 645c6b8..a75b9c7 100644
--- a/gitolite.spec
+++ b/gitolite.spec
@@ -8,7 +8,7 @@
 
 Name:           gitolite
 Version:        1.5.9.1
-Release:        1%{?dist}.1
+Release:        2%{?dist}
 Summary:        Highly flexible server for git directory version tracker
 
 Group:          Applications/System
@@ -72,6 +72,7 @@ install -d $RPM_BUILD_ROOT%{gitolite_homedir}
 install -d $RPM_BUILD_ROOT%{gitolite_homedir}/.ssh
 install -d $RPM_BUILD_ROOT%{_bindir}
 install -d $RPM_BUILD_ROOT%{perl_vendorlib}
+echo "%{version}-%{release}" >conf/VERSION
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # Code
@@ -109,6 +110,9 @@ exit 0
 
 
 %changelog
+* Fri Feb 17 2012 Jon Ciesla <limburgher at gmail.com> - 1.5.9.1-2
+- Improve version handling.
+
 * Thu Feb 24 2011 Lubomir Rintel <lkundrak at v3.sk> - 1.5.9.1-1.1
 - Remove Markdown format from el5