Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  Fixed broken git help -w when installing from RPM
maint
Junio C Hamano 2009-02-05 19:38:58 -08:00
commit 919ab6429a
1 changed files with 4 additions and 1 deletions

View File

@ -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.