Backport fix for unreadable yum.log from upstream.

This commit is contained in:
Richard W.M. Jones 2010-01-29 14:29:15 +00:00
parent f2f842aa81
commit 9c296f3992
2 changed files with 31 additions and 2 deletions

View File

@ -0,0 +1,24 @@
From 088d0c53cfe0dcb20b87707a9055175b2fd6b72f Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@redhat.com>
Date: Fri, 29 Jan 2010 14:24:54 +0000
Subject: [PATCH] Another unreadable file: /var/log/yum.log
---
appliance/make.sh.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/appliance/make.sh.in b/appliance/make.sh.in
index 677e995..515df34 100755
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -115,6 +115,7 @@ if [ "@DIST@" = "REDHAT" ]; then
/var/log/spooler \
/var/log/messages \
/var/log/btmp \
+ /var/log/yum.log \
$(cd initramfs && echo usr/sbin/glibc_post_upgrade.*)
# Kernel modules take up nearly half of the image. Only include ones
--
1.6.5.2

View File

@ -5,7 +5,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.0.82
Release: 5%{?dist}
Release: 6%{?dist}
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@ -18,6 +18,9 @@ Patch0: libguestfs-1.0.79-no-fuse-test.patch
# Backport RHBZ557655 test fix from upstream.
Patch1: libguestfs-1.0.82-fix-rhbz557655-regression-test.patch
# Backport fix for unreadable yum.log from upstream.
Patch2: libguestfs-1.0.82-another-unreadable-file-var-log-yum-log.patch
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text
@ -338,6 +341,7 @@ Requires: jpackage-utils
%patch0 -p1
%patch1 -p1
%patch2 -p1
mkdir -p daemon/m4
@ -613,8 +617,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Jan 29 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.82-5
* Fri Jan 29 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.82-6
- Backport a better fix for RHBZ557655 test from upstream.
- Backport fix for unreadable yum.log from upstream.
* Thu Jan 28 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.82-3
- Backport RHBZ557655 test fix from upstream.