[libguestfs] Not a bug in yum, but in my shell script.

[Richard W.M. Jones]

commit 87a98217190dea405523edc8ebfd170f46c30a29
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Dec 6 19:48:29 2010 +0000

    Not a bug in yum, but in my shell script.

 0002-Add-with-febootstrap-yum-config.patch |    6 +++---
 libguestfs.spec                            |    8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/0002-Add-with-febootstrap-yum-config.patch b/0002-Add-with-febootstrap-yum-config.patch
index 29e5b54..52fe2f6 100644
--- a/0002-Add-with-febootstrap-yum-config.patch
+++ b/0002-Add-with-febootstrap-yum-config.patch
@@ -1,4 +1,4 @@
-From 23b321b960d1e224fd293662d4c31e5ccfbc8ae9 Mon Sep 17 00:00:00 2001
+From 461dc7038433c5183a428f88495c792a0aa4906c Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones at redhat.com>
 Date: Mon, 6 Dec 2010 17:44:06 +0000
 Subject: [PATCH 2/2] Add --with-febootstrap-yum-config.
@@ -13,7 +13,7 @@ The hope is that this will enable building in Koji.
  2 files changed, 14 insertions(+), 17 deletions(-)
 
 diff --git a/appliance/make.sh.in b/appliance/make.sh.in
-index bab0529..55b6530 100755
+index bab0529..9e54b4a 100755
 --- a/appliance/make.sh.in
 +++ b/appliance/make.sh.in
 @@ -24,12 +24,13 @@ set -e
@@ -25,7 +25,7 @@ index bab0529..55b6530 100755
 -else
 -    @FEBOOTSTRAP@ -v -o supermin.d $excludes @PACKAGE_DIRECTORY@/*
 +if [ "x at FEBOOTSTRAP_YUM_CONFIG@" != "xno" ]; then
-+    extra="--yum-config '@FEBOOTSTRAP_YUM_CONFIG@'"
++    extra="--yum-config @FEBOOTSTRAP_YUM_CONFIG@"
  fi
  
 +echo @FEBOOTSTRAP@ -v -o supermin.d --names $(< packagelist ) $excludes $extra
diff --git a/libguestfs.spec b/libguestfs.spec
index 9416495..4fc0282 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -30,7 +30,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.7.19
-Release:       7%{?dist}
+Release:       8%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -453,9 +453,7 @@ failovermethod=priority
 enabled=1
 gpgcheck=0
 EOF
-# Note that yum.conf has to be a relative path because of a bug
-# in this version of the yum API.
-%define extra --with-febootstrap-yum-config=../yum.conf
+%define extra --with-febootstrap-yum-config=$(pwd)/yum.conf
 %endif
 
 ./configure \
@@ -741,7 +739,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Dec  6 2010 Richard Jones <rjones at redhat.com> - 1:1.7.19-7
+* Mon Dec  6 2010 Richard Jones <rjones at redhat.com> - 1:1.7.19-8
 - Rebuild appliance properly using febootstrap 3.1 and alternate yum repo.
 
 * Sun Dec  5 2010 Richard Jones <rjones at redhat.com> - 1:1.7.19-1