Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
Fixed broken git help -w when installing from RPM

diff --combined git.spec.in
index 069ace050d2eec5a6f5f805d59f0208da01fdf1b,0319c82a7ca03396285a6111e0cda1725f3f29c7..4be0834f0bc1cebc2b341ef6f54c3c37f48eb832
--- 1/git.spec.in
--- 2/git.spec.in
+++ b/git.spec.in
@@@ -97,7 -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
@@@ -168,7 -168,6 +168,7 @@@ rm -rf $RPM_BUILD_ROO
  %defattr(-,root,root)
  %{_libexecdir}/git-core/git-gui
  %{_libexecdir}/git-core/git-citool
 +%{_libexecdir}/git-core/git-gui--askpass
  %{_datadir}/git-gui/
  %{!?_without_docs: %{_mandir}/man1/git-gui.1*}
  %{!?_without_docs: %doc Documentation/git-gui.html}
@@@ -190,6 -189,9 +190,9 @@@
  # 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.