[febootstrap] Work around brokenness in yum (RHBZ#850913).

[Richard W.M. Jones]

commit 4ac3ad5e7d8b105a873ee4980eea0e250820c959
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Aug 22 18:40:19 2012 +0100

    Work around brokenness in yum (RHBZ#850913).
    
    - Remove defattr, no longer required.

 ...k-around-yet-more-brokenness-in-yum-RHBZ-.patch |   28 ++++++++++++++++++++
 febootstrap.spec                                   |   12 ++++++--
 2 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/0001-yum-rpm-Work-around-yet-more-brokenness-in-yum-RHBZ-.patch b/0001-yum-rpm-Work-around-yet-more-brokenness-in-yum-RHBZ-.patch
new file mode 100644
index 0000000..d389d79
--- /dev/null
+++ b/0001-yum-rpm-Work-around-yet-more-brokenness-in-yum-RHBZ-.patch
@@ -0,0 +1,28 @@
+From 22d69a89d3b8876822b354a27c0e233f0fd96a39 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Wed, 22 Aug 2012 18:36:59 +0100
+Subject: [PATCH] yum-rpm: Work around yet more brokenness in yum
+ (RHBZ#850913).
+
+---
+ src/febootstrap_yum_rpm.ml |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/febootstrap_yum_rpm.ml b/src/febootstrap_yum_rpm.ml
+index 1999f1c..3506e21 100644
+--- a/src/febootstrap_yum_rpm.ml
++++ b/src/febootstrap_yum_rpm.ml
+@@ -52,6 +52,10 @@ if verbose:
+ yb = yum.YumBase ()
+ yb.preconf.debuglevel = verbose
+ yb.preconf.errorlevel = verbose
++try:
++    yb.prerepoconf.multi_progressbar = None
++except:
++    pass
+ if %s:
+     yb.preconf.fn = %S
+ try:
+-- 
+1.7.10.4
+
diff --git a/febootstrap.spec b/febootstrap.spec
index c79f88e..88e2749 100644
--- a/febootstrap.spec
+++ b/febootstrap.spec
@@ -1,12 +1,15 @@
 Summary:     Bootstrapping tool for creating supermin appliances
 Name:        febootstrap
 Version:     3.19
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     GPLv2+
 Group:       Development/Tools
 URL:         http://people.redhat.com/~rjones/febootstrap/
 Source0:     http://libguestfs.org/download/febootstrap/%{name}-%{version}.tar.gz
 
+# Work around brokenness in yum (RHBZ#850913).
+Patch1:      0001-yum-rpm-Work-around-yet-more-brokenness-in-yum-RHBZ-.patch
+
 %if 0%{?rhel} >= 7
 ExclusiveArch: x86_64
 %endif
@@ -57,6 +60,7 @@ Requires:    e2fsprogs-libs >= 1.42
 
 %prep
 %setup -q
+%patch1 -p1
 
 
 %build
@@ -76,20 +80,22 @@ execstack -c $RPM_BUILD_ROOT%{_bindir}/febootstrap-supermin-helper
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/febootstrap
 %{_mandir}/man8/febootstrap.8*
 
 
 %files supermin-helper
-%defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/febootstrap-supermin-helper
 %{_mandir}/man8/febootstrap-supermin-helper.8*
 
 
 %changelog
+* Wed Aug 22 2012 Richard W.M. Jones <rjones at redhat.com> - 1:3.19-2
+- Work around brokenness in yum (RHBZ#850913).
+- Remove defattr, no longer required.
+
 * Tue Jul 31 2012 Richard W.M. Jones <rjones at redhat.com> - 1:3.19-1
 - New upstream version 3.19.