[gitolite] 2 fixes.
Jon Ciesla
limb at fedoraproject.org
Tue Jan 24 14:45:53 UTC 2012
commit 3be1fa1f43f8724545869a14f3d8e9ff200dd732
Author: Jon Ciesla <limburgher at gmail.com>
Date: Tue Jan 24 08:45:44 2012 -0600
2 fixes.
gitolite-2.0-rpm.patch | 13 +++++++++++++
gitolite.spec | 7 ++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/gitolite-2.0-rpm.patch b/gitolite-2.0-rpm.patch
index 93eb7e3..38541a1 100644
--- a/gitolite-2.0-rpm.patch
+++ b/gitolite-2.0-rpm.patch
@@ -68,3 +68,16 @@ 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 2b4eb67..bdd2845 100644
--- a/gitolite.spec
+++ b/gitolite.spec
@@ -8,7 +8,7 @@
Name: gitolite
Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Highly flexible server for git directory version tracker
Group: Applications/System
@@ -83,6 +83,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
# Code
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}
cp -a conf hooks $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -116,6 +117,10 @@ exit 0
%changelog
+* Tue Jan 24 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.1-2
+- Include sshkeys-lint. Thanks Mukund Sivaraman!
+- Patched to prevent abort at version check, BZ 781589.
+
* Sun Jan 08 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.1-1
- 2.2.1.
More information about the scm-commits
mailing list