Fix yum.conf building.

libguestfs.spec

@@ -30,7 +30,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.7.19
-Release:       10%{?dist}
+Release:       11%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -444,19 +444,15 @@ mkdir -p daemon/m4
 mkdir repo
 find /var/cache/yum -type f -name '*.rpm' -print0 | xargs -0 cp -t repo
 createrepo repo
-cp /etc/yum.conf yum.conf
-cat >> yum.conf <<EOF
+cat > yum.conf <<EOF
 [main]
-cachedir=/var/cache/yum/\$basearch/\$releasever
-keepcache=0
-debuglevel=2
+cachedir=/var/cache/yum
+debuglevel=1
 logfile=/var/log/yum.log
-exactarch=1
+retries=20
 obsoletes=1
-gpgcheck=1
-plugins=1
-installonly_limit=3
-color=never
+gpgcheck=0
+assumeyes=1
 reposdir=/dev/null
 
 [local]
@@ -467,9 +463,9 @@ enabled=1
 gpgcheck=0
 EOF
 %define extra --with-febootstrap-yum-config=$(pwd)/yum.conf
-echo /etc/yum.conf ----------------------------------------
+echo "==== /etc/yum.conf ===="
 cat /etc/yum.conf
-echo our yum.conf ----------------------------------------
+echo "==== our yum.conf ===="
 cat yum.conf
 %endif
 
@@ -756,7 +752,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Dec  6 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-10
+* Mon Dec  6 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-11
 - Rebuild appliance properly using febootstrap 3.1 and alternate yum repo.
 
 * Sun Dec  5 2010 Richard Jones <rjones@redhat.com> - 1:1.7.19-1