rpms/mercurial/F-7 mercurial.spec,1.29,1.30

[Neal Becker (nbecker)]

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27827

Modified Files:
	mercurial.spec 
Log Message:
Patch to hgk



Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-7/mercurial.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mercurial.spec	8 Apr 2008 15:53:25 -0000	1.29
+++ mercurial.spec	9 Apr 2008 15:36:32 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 1.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -106,7 +106,8 @@
 understandable way and shows diffs for each revision.  Based on
 gitk for the git SCM.
 
-See http://www.selenic.com/mercurial/wiki/index.cgi/UsingHgk for more
+Adds the "hg view" command.  See 
+http://www.selenic.com/mercurial/wiki/index.cgi/UsingHgk for more
 documentation.
 
 %prep
@@ -123,7 +124,7 @@
 grep -v 'hgk.py*' < %{name}.files > %{name}-base.files
 grep 'hgk.py*' < %{name}.files > %{name}-hgk.files
 
-install contrib/hgk          $RPM_BUILD_ROOT%{_bindir}
+install -D contrib/hgk       $RPM_BUILD_ROOT%{_libexecdir}/mercurial/hgk
 install contrib/convert-repo $RPM_BUILD_ROOT%{_bindir}/mercurial-convert-repo
 install contrib/hg-ssh       $RPM_BUILD_ROOT%{_bindir}
 install contrib/git-viz/{hg-viz,git-rev-tree} $RPM_BUILD_ROOT%{_bindir}
@@ -160,6 +161,9 @@
 [extensions]
 # enable hgk extension ('hg help' shows 'view' as a command)
 hgk=
+
+[hgk]
+path=%{_libexecdir}/mercurial/hgk
 EOF
 install hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
 
@@ -199,13 +203,16 @@
 
 
 %files hgk -f %{name}-hgk.files
-%{_bindir}/hgk
+%{_libexecdir}/mercurial/
 %{_sysconfdir}/mercurial/hgrc.d/hgk.rc
 
 #%check
 #cd tests && python run-tests.py
 
 %changelog
+* Wed Apr  9 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-10
+- Patch to hgk from Mads Kiilerich <mads at kiilerich.com>
+
 * Tue Apr  8 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-9
 - Add '-l mercurial.el' for emacs also