[yum] Update to latest HEAD.

[James Antill]

commit bf87b9c0e7b283feffb8854b949fc3329485850a
Author: James Antill <james at and.org>
Date:   Mon Nov 11 09:49:21 2013 -0500

    Update to latest HEAD.
    
    - Fixup always turning cron/makecache systemd stuff off.
    - _readRawRepoFile: return only valid (ini, section_id). BZ 1018795.
    - Same-mirror retry on refused connections. Helps BZ 853432.

 yum-HEAD.patch |   29 ++++++++++++++++-------------
 yum.spec       |    7 +++++--
 2 files changed, 21 insertions(+), 15 deletions(-)
---
diff --git a/yum-HEAD.patch b/yum-HEAD.patch
index 4f18137..16c76ee 100644
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@ -186366,10 +186366,10 @@ index 1ce4720..2f3f7a3
      gobject.threads_init()
      dbus.glib.threads_init()
 diff --git a/yum.spec b/yum.spec
-index abd203f..b5f39be 100644
+index abd203f..31b51a0 100644
 --- a/yum.spec
 +++ b/yum.spec
-@@ -1,24 +1,97 @@
+@@ -1,24 +1,100 @@
 -Summary: RPM installer/updater
 +%define move_yum_conf_back 1
 +%define auto_sitelib 1
@@ -186445,6 +186445,9 @@ index abd203f..b5f39be 100644
  BuildRequires: gettext
  BuildRequires: intltool
 -
++%if %{yum_makecache_systemd}
++BuildRequires: systemd-units
++%endif
 +# This is really CheckRequires ...
 +BuildRequires: python-nose
 +BuildRequires: python >= 2.4
@@ -186473,7 +186476,7 @@ index abd203f..b5f39be 100644
  Conflicts: rpm >= 5-0
  # Zif is a re-implementation of yum in C, however:
  #
-@@ -34,18 +107,32 @@ Conflicts: rpm >= 5-0
+@@ -34,18 +110,32 @@ Conflicts: rpm >= 5-0
  # zif experts).
  #
  # ...so we have two sane choices: i) Conflict with it. 2) Stop developing yum.
@@ -186513,7 +186516,7 @@ index abd203f..b5f39be 100644
  
  %description
  Yum is a utility that can check for and automatically download and
-@@ -58,9 +145,11 @@ Group: Applications/System
+@@ -58,9 +148,11 @@ Group: Applications/System
  Requires: yum = %{version}-%{release}
  Requires: dbus-python
  Requires: pygobject2
@@ -186527,7 +186530,7 @@ index abd203f..b5f39be 100644
  Requires(postun): /sbin/service
  
  
-@@ -68,33 +157,74 @@ Requires(postun): /sbin/service
+@@ -68,33 +160,74 @@ Requires(postun): /sbin/service
  yum-updatesd provides a daemon which checks for available updates and 
  can notify you when they are available via email, syslog or dbus. 
  
@@ -186607,7 +186610,7 @@ index abd203f..b5f39be 100644
  
  # Ghost files:
  mkdir -p $RPM_BUILD_ROOT/var/lib/yum/history
-@@ -102,12 +232,31 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/yum/plugins
+@@ -102,12 +235,31 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/yum/plugins
  mkdir -p $RPM_BUILD_ROOT/var/lib/yum/yumdb
  touch $RPM_BUILD_ROOT/var/lib/yum/uuid
  
@@ -186627,8 +186630,8 @@ index abd203f..b5f39be 100644
 +%endif
 +
 +%if %{yum_makecache_systemd}
-+cp -a etc/yum-makecache.service /usr/lib/systemd/system
-+cp -a etc/yum-makecache.timer   /usr/lib/systemd/system
++cp -a etc/yum-makecache.service $RPM_BUILD_ROOT/%{_unitdir}
++cp -a etc/yum-makecache.timer   $RPM_BUILD_ROOT/%{_unitdir}
 +%endif
 +
  %clean
@@ -186639,7 +186642,7 @@ index abd203f..b5f39be 100644
  %post updatesd
  /sbin/chkconfig --add yum-updatesd
  /sbin/service yum-updatesd condrestart >/dev/null 2>&1
-@@ -119,9 +268,29 @@ if [ $1 = 0 ]; then
+@@ -119,9 +271,29 @@ if [ $1 = 0 ]; then
   /sbin/service yum-updatesd stop >/dev/null 2>&1
  fi
  exit 0
@@ -186670,7 +186673,7 @@ index abd203f..b5f39be 100644
  # Make sure chkconfig knows about the service
  /sbin/chkconfig --add yum-cron
  # if an upgrade:
-@@ -144,8 +313,13 @@ if [ "$1" -ge "1" ]; then
+@@ -144,8 +316,13 @@ if [ "$1" -ge "1" ]; then
   fi
  fi 
  exit 0
@@ -186684,7 +186687,7 @@ index abd203f..b5f39be 100644
  # if this will be a complete removeal of yum-cron rather than an upgrade,
  # remove the service from chkconfig control
  if [ $1 = 0 ]; then
-@@ -153,33 +327,59 @@ if [ $1 = 0 ]; then
+@@ -153,33 +330,59 @@ if [ $1 = 0 ]; then
   /sbin/service yum-cron stop 1> /dev/null 2>&1
  fi
  exit 0
@@ -186750,7 +186753,7 @@ index abd203f..b5f39be 100644
  %dir /var/cache/yum
  %dir /var/lib/yum
  %ghost /var/lib/yum/uuid
-@@ -188,20 +388,31 @@ exit 0
+@@ -188,20 +391,31 @@ exit 0
  %ghost /var/lib/yum/yumdb
  %{_mandir}/man*/yum.*
  %{_mandir}/man*/yum-shell*
@@ -186790,7 +186793,7 @@ index abd203f..b5f39be 100644
  %files updatesd
  %defattr(-, root, root)
  %config(noreplace) %{_sysconfdir}/yum/yum-updatesd.conf
-@@ -210,8 +421,12 @@ exit 0
+@@ -210,8 +424,12 @@ exit 0
  %{_datadir}/yum-cli/yumupd.py*
  %{_sbindir}/yum-updatesd
  %{_mandir}/man*/yum-updatesd*
diff --git a/yum.spec b/yum.spec
index ddb821d..8dd481d 100644
--- a/yum.spec
+++ b/yum.spec
@@ -79,6 +79,9 @@ BuildArchitectures: noarch
 BuildRequires: python
 BuildRequires: gettext
 BuildRequires: intltool
+%if %{yum_makecache_systemd}
+BuildRequires: systemd-units
+%endif
 # This is really CheckRequires ...
 BuildRequires: python-nose
 BuildRequires: python >= 2.4
@@ -265,8 +268,8 @@ rm -f $RPM_BUILD_ROOT/%{_unitdir}/yum-cron.service
 %endif
 
 %if %{yum_makecache_systemd}
-cp -a etc/yum-makecache.service /usr/lib/systemd/system
-cp -a etc/yum-makecache.timer   /usr/lib/systemd/system
+cp -a etc/yum-makecache.service $RPM_BUILD_ROOT/%{_unitdir}
+cp -a etc/yum-makecache.timer   $RPM_BUILD_ROOT/%{_unitdir}
 %endif
 
 %clean