[git] Update to 1.8.5.2

[Ondrej Oprala]

commit a29da9568fa4194b4714b19a320be5d5bb286dd7
Author: Ondrej Oprala <ooprala at redhat.com>
Date:   Wed Dec 18 14:54:54 2013 +0100

    Update to 1.8.5.2

 ...tree-Use-gitexecdir-instead-of-libexecdir.patch |    2 +-
 git.spec                                           |    9 ++++++---
 sources                                            |    6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch b/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch
index af57b28..421710c 100644
--- a/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch
+++ b/0001-git-subtree-Use-gitexecdir-instead-of-libexecdir.patch
@@ -29,7 +29,7 @@ index 435b2de..dc8da19 100644
  
  gitver ?= $(word 3,$(shell git --version))
 @@ -30,8 +29,8 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH)
- doc: $(GIT_SUBTREE_DOC)
+ doc: $(GIT_SUBTREE_DOC) $(GIT_SUBTREE_HTML)
  
  install: $(GIT_SUBTREE)
 -	$(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)
diff --git a/git.spec b/git.spec
index 6ec930c..134e101 100644
--- a/git.spec
+++ b/git.spec
@@ -50,8 +50,8 @@
 %endif
 
 Name:           git
-Version:        1.8.4.2
-Release:        2%{?dist}
+Version:        1.8.5.2
+Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
@@ -317,7 +317,7 @@ Requires:       emacs-git = %{version}-%{release}
 %patch3 -p1
 %endif
 %patch5 -p1
-%patch6 -p1
+#%patch6 -p1
 
 %if %{use_prebuilt_docs}
 mkdir -p prebuilt_docs/{html,man}
@@ -641,6 +641,9 @@ rm -rf %{buildroot}
 # No files for you!
 
 %changelog
+* Wed Dec 18 2013 Ondrej Oprala <ooprala at redhat.com> - 1.8.5.2-1
+* Update to 1.8.5.2
+
 * Wed Nov 13 2013 Ville Skyttä <ville.skytta at iki.fi> - 1.8.4.2-2
 - Fix htmldir when doc dir is unversioned (#993779).
 
diff --git a/sources b/sources
index 84b079d..be78e4a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-6f63d103465b86ca0ebe4189ea54731c  git-1.8.4.2.tar.gz
-c76a6755d109bd2881da6813dac69153  git-htmldocs-1.8.4.2.tar.gz
-2b4719ec820d845134b689247abe65e8  git-manpages-1.8.4.2.tar.gz
+df8519044f9880f3687d863d99245282  git-1.8.5.2.tar.gz
+ef4cd0547218bcdbe0a09487f8d3675c  git-htmldocs-1.8.5.2.tar.gz
+27851cc39808f1be6d3789fae87c8308  git-manpages-1.8.5.2.tar.gz