aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-05 19:40:25 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-05 19:40:25 -0800
commit84b96278cc164b748b2c9dbe489f8d7b30bbbc4e (patch)
treeebb9b789f916383ec7653dbc791c15de73d7e244
parentMakefile: minor improvements for Mac OS X (Darwin) (diff)
parentMerge branch 'maint-1.6.0' into maint (diff)
downloadgit-84b96278cc164b748b2c9dbe489f8d7b30bbbc4e.tar.gz
git-84b96278cc164b748b2c9dbe489f8d7b30bbbc4e.zip
Merge branch 'maint'
* maint: Fixed broken git help -w when installing from RPM
-rw-r--r--git.spec.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/git.spec.in b/git.spec.in
index 069ace050d..4be0834f0b 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -97,7 +97,7 @@ BuildRequires: perl(Error)
%description -n perl-Git
Perl interface to Git
-%define path_settings ETC_GITCONFIG=/etc/gitconfig prefix=%{_prefix} mandir=%{_mandir} htmldir=%{_docdir}/%{name}-core-%{version}
+%define path_settings ETC_GITCONFIG=/etc/gitconfig prefix=%{_prefix} mandir=%{_mandir} htmldir=%{_docdir}/%{name}-%{version}
%prep
%setup -q
@@ -190,6 +190,9 @@ rm -rf $RPM_BUILD_ROOT
# No files for you!
%changelog
+* Mon Feb 04 2009 David J. Mellor <dmellor@whistlingcat.com>
+- fixed broken git help -w after renaming the git-core package to git.
+
* Fri Sep 12 2008 Quy Tonthat <qtonthat@gmail.com>
- move git-cvsserver to bindir.