Re: "Read my lips: no more merges" - aka Linux 2.6.14-rc1

From: Horst von Brand <vonbrand@inf.utfsm.cl>
Date: 2005-09-16 14:08:24
Linus Torvalds <torvalds@osdl.org> wrote:
> On Wed, 14 Sep 2005, Alejandro Bonilla Beeche wrote:
> > 
> > debian:~# cd linux-2.6/
> > debian:~/linux-2.6# git log
> > /usr/local/bin/git-log-script: line 4: less: command not found
> 
> A very strange Linux installation that doesn't come with "less"...
> 
> What a strange box. Anyway, that does point out that maybe the git RPM 
> spec should have "less" as a dependency. 

Your wish is my command.

----
The git commands assume less(1) as pager. This adds the dependency, as
suggested by Linus.

Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>


---

 git-core.spec.in |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

0abd0856f2cb750a019451c7547694f36e60e83b
diff --git a/git-core.spec.in b/git-core.spec.in
--- a/git-core.spec.in
+++ b/git-core.spec.in
@@ -10,7 +10,7 @@ URL: 		http://kernel.org/pub/software/sc
 Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
 BuildRequires:	zlib-devel, openssl-devel, curl-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-Requires: 	sh-utils, curl, diffutils, rsync, rcs, openssh-clients, perl, python >= 2.4, tk
+Requires: 	sh-utils, curl, diffutils, less, rsync, rcs, openssh-clients, perl, python >= 2.4, tk
 
 %description
 This is a stupid (but extremely fast) directory content manager.  It
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 %{!?_without_docs: %{_mandir}/man7/*.7*}
 
 %changelog
+* Fri Sep 16 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl>
+- Linus noticed that less is required, added to the dependencies
+
 * Sun Sep 11 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl>
 - Updated dependencies
 - Don't assume manpages are gzipped
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Fri Sep 16 15:00:35 2005

This archive was generated by hypermail 2.1.8 : 2005-09-16 15:00:37 EST