From 021f6c037a871b2ff4294ce1292d50e67dc61d0e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 6 Jan 2016 10:51:10 +0000
Subject: [PATCH] Revert hack to supermin to get builds working temporarily.

This reverts commit 777f74553b55e2f2a1936ba126dc92486fe10b0a
and commit 70f64c1be1088901c313447cdb612777153a2e25.
---
 libguestfs.spec | 48 ++++++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/libguestfs.spec b/libguestfs.spec
index e7de29b..9cddd05 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -813,33 +813,29 @@ ip route list ||:
 if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then
   extra=
 else
-  # Temporarily until https://fedorahosted.org/rel-eng/ticket/6274
-  # is fixed in Koji.  This isn't a permanent solution because the
-  # non-root build process cannot read all /etc files.
-  extra="--with-supermin-extra-options=--use-installed"
-#   mkdir repo
-#   # -n 1 because of RHBZ#980502.
-#   find /var/cache/yum -type f -name '*.rpm' -print0 | xargs -0 -n 1 cp -t repo
-#   createrepo repo
-#   cat > yum.conf <<EOF
-# [main]
-# cachedir=/var/cache/yum
-# debuglevel=1
-# logfile=/var/log/yum.log
-# retries=20
-# obsoletes=1
-# gpgcheck=0
-# assumeyes=1
-# reposdir=/dev/null
+  mkdir repo
+  # -n 1 because of RHBZ#980502.
+  find /var/cache/yum -type f -name '*.rpm' -print0 | xargs -0 -n 1 cp -t repo
+  createrepo repo
+  cat > yum.conf <<EOF
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+reposdir=/dev/null
 
-# [local]
-# name=local
-# baseurl=file://$(pwd)/repo
-# failovermethod=priority
-# enabled=1
-# gpgcheck=0
-# EOF
-#   extra=--with-supermin-packager-config=$(pwd)/yum.conf
+[local]
+name=local
+baseurl=file://$(pwd)/repo
+failovermethod=priority
+enabled=1
+gpgcheck=0
+EOF
+  extra=--with-supermin-packager-config=$(pwd)/yum.conf
 fi
 
 %global localconfigure \