[gitolite/el6] Fixed version handling.
Jon Ciesla
limb at fedoraproject.org
Fri Feb 17 15:12:29 UTC 2012
commit 91a89d83689c3185a5cf137bcf562319b1dac604
Author: Jon Ciesla <limburgher at gmail.com>
Date: Fri Feb 17 09:12:18 2012 -0600
Fixed version handling.
gitolite-2.0-rpm.patch | 12 ------------
gitolite.spec | 6 +++++-
2 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/gitolite-2.0-rpm.patch b/gitolite-2.0-rpm.patch
index 0417898..b07219d 100644
--- a/gitolite-2.0-rpm.patch
+++ b/gitolite-2.0-rpm.patch
@@ -12,18 +12,6 @@ diff -ur sitaramc-gitolite-4c1e4b2.orig/conf/example.gitolite.rc sitaramc-gitoli
# ------------------------------------------------------------------------------
# most often used/changed variables
-diff -ur sitaramc-gitolite-4c1e4b2.orig/src/gitolite.pm sitaramc-gitolite-4c1e4b2/src/gitolite.pm
---- sitaramc-gitolite-4c1e4b2.orig/src/gitolite.pm 2011-08-08 00:17:56.000000000 -0400
-+++ sitaramc-gitolite-4c1e4b2/src/gitolite.pm 2011-08-08 14:10:35.330500567 -0400
-@@ -493,7 +493,7 @@
- sub report_version {
- my($user) = @_;
- print "hello $user, the gitolite version here is ";
-- print slurp( ($GL_PACKAGE_CONF || "$GL_ADMINDIR/conf") . "/VERSION" );
-+ system("rpm", "-q", "--qf", '%{version}-%{release}', 'gitolite');
- }
-
- sub perm_code {
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
diff --git a/gitolite.spec b/gitolite.spec
index e84a770..3db964f 100644
--- a/gitolite.spec
+++ b/gitolite.spec
@@ -8,7 +8,7 @@
Name: gitolite
Version: 2.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Highly flexible server for git directory version tracker
Group: Applications/System
@@ -79,6 +79,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
@@ -116,6 +117,9 @@ exit 0
%changelog
+* Fri Feb 17 2012 Jon Ciesla <limburgher at gmail.com> - 2.0.3-3
+- Fixed version handling.
+
* Mon Aug 08 2011 Jon Ciesla <limb at jcomserv.net> - 2.0.3-2
- Updated rpm patch to fix hooks, BZ 713020.
More information about the scm-commits
mailing list