[gitolite] Patch for hook probagation.
Jon Ciesla
limb at fedoraproject.org
Fri Mar 23 13:27:46 UTC 2012
commit 4a9e45580602ebd117b4e19004e32076b38b5500
Author: Jon Ciesla <limburgher at gmail.com>
Date: Fri Mar 23 08:26:29 2012 -0500
Patch for hook probagation.
gitolite-2.3-configgen.patch | 12 ++++++++++++
gitolite.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/gitolite-2.3-configgen.patch b/gitolite-2.3-configgen.patch
new file mode 100644
index 0000000..c9f8b4e
--- /dev/null
+++ b/gitolite-2.3-configgen.patch
@@ -0,0 +1,12 @@
+--- sitaramc-gitolite-4c1e4b2/src/gitolite.pm.orig 2012-02-27 21:59:09.699580170 +0100
++++ sitaramc-gitolite-4c1e4b2/src/gitolite.pm 2012-02-27 21:59:28.802476445 +0100
+@@ -482,7 +482,8 @@
+ system("git config --remove-section gitweb 2>/dev/null");
+ }
+
+- return ($desc or can_read($repo, 'gitweb'));
++ my $cr = can_read($repo, 'gitweb');
++ return ($desc or $cr);
+ # this return value is used by the caller to write to projects.list
+ }
+
diff --git a/gitolite.spec b/gitolite.spec
index bd8a5bf..80af0a6 100644
--- a/gitolite.spec
+++ b/gitolite.spec
@@ -8,7 +8,7 @@
Name: gitolite
Version: 2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Highly flexible server for git directory version tracker
Group: Applications/System
@@ -26,6 +26,7 @@ Source1: gitolite-README-fedora
Patch0: gitolite-2.0-rpm.patch
#Patch1: gitolite-1.4.2-conf.patch
#Patch2: adcfix.post-v2.patch
+Patch3: gitolite-2.3-configgen.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
@@ -57,6 +58,7 @@ elsewhere in the doc/ directory.
%patch0 -p1
#%patch1 -p1
#%patch2 -p1
+%patch3 -p1
cp %{SOURCE1} .
@@ -118,6 +120,9 @@ exit 0
%changelog
+* Fri Mar 23 2012 Jon Ciesla <limburgher at gmail.com> - 2.3-2
+- Patch for hook propagation, BZ 798051.
+
* Thu Feb 16 2012 Jon Ciesla <limburgher at gmail.com> - 2.3-1
- Created VERSION at build time.
- Stop calling rpm to get version.
More information about the scm-commits
mailing list