Merge refs/heads/master from .

diff --git a/git-core.spec.in b/git-core.spec.in
index 397be8540cc0123eccb41801209b3f52e34bfd62..ef7cd26b967d91e9db18f1f29dcd52dd8593bb65 100644 (file)
--- a/git-core.spec.in
+++ b/git-core.spec.in
@@ -10,7 +10,7 @@ URL:          http://kernel.org/pub/software/scm/git/
 Source:        http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
 BuildRequires: zlib-devel, openssl-devel, curl-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-Prereq:        sh-utils, diffutils, rsync, rcs, mktemp >= 1.5
+Requires:      sh-utils, diffutils, rsync, rcs, mktemp >= 1.5
 
 %description
 This is a stupid (but extremely fast) directory content manager.  It
@@ -28,8 +28,8 @@ make prefix=%{_prefix} all %{!?_without_docs: doc}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
-     install install-tools %{!?_without_docs: install-doc}
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
+     install %{!?_without_docs: install-doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT