summaryrefslogtreecommitdiff
path: root/git.spec.in
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-06 03:38:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-06 03:38:58 (GMT)
commit919ab6429aab9af44feea0768feef80f3092e9d3 (patch)
tree34a6e799b49b5c4b3f3f00a3e86148e8af203c72 /git.spec.in
parentc7893501e879ebb541a55e5633f7e0f1729407cb (diff)
parentab2fdb3b62589477bde0cd0af8239bee510c3488 (diff)
downloadgit-919ab6429aab9af44feea0768feef80f3092e9d3.zip
git-919ab6429aab9af44feea0768feef80f3092e9d3.tar.gz
git-919ab6429aab9af44feea0768feef80f3092e9d3.tar.bz2
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: Fixed broken git help -w when installing from RPM
Diffstat (limited to 'git.spec.in')
-rw-r--r--git.spec.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/git.spec.in b/git.spec.in
index 069ace0..4be0834 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.