From f9ee176d4c102b23d8664439741d8a05e5f44885 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Mar 2013 00:01:05 +0000 Subject: [PATCH] Add patch for broken 'file' command in Rawhide (RHBZ#928995). --- file-bz928995.patch | 11 +++++++++++ libguestfs.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 file-bz928995.patch diff --git a/file-bz928995.patch b/file-bz928995.patch new file mode 100644 index 0000000..68ff133 --- /dev/null +++ b/file-bz928995.patch @@ -0,0 +1,11 @@ +--- libguestfs-1.21.23.old/generator/actions.ml 2013-03-19 12:24:40.000000000 +0000 ++++ libguestfs-1.21.23/generator/actions.ml 2013-03-28 23:58:07.738134412 +0000 +@@ -3681,7 +3681,7 @@ + proc_nr = Some 49; + tests = [ + InitISOFS, Always, TestOutput ( +- [["file"; "/empty"]], "empty"); ++ [["file"; "/empty"]], "empty "); + InitISOFS, Always, TestOutput ( + [["file"; "/known-1"]], "ASCII text"); + InitISOFS, Always, TestLastFail ( diff --git a/libguestfs.spec b/libguestfs.spec index 1930467..224bfda 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -22,7 +22,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.21.23 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ # Source and patches. @@ -32,6 +32,9 @@ Source0: http://libguestfs.org/download/1.21-development/%{name}-%{version Patch0001: 0001-Use-new-style-demand-loaded-bash-completion-scripts.patch BuildRequires: autoconf, automake, libtool, gettext-devel +# Workaround for broken file (RHBZ#928995). +Patch2: file-bz928995.patch + # Basic build requirements: BuildRequires: perl(Pod::Simple) BuildRequires: perl(Pod::Man) @@ -671,6 +674,7 @@ for %{name}. %patch0001 -p1 autoreconf -i +%patch2 -p1 if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then # For sVirt to work, the local temporary directory we use in the @@ -1035,6 +1039,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs %changelog +* Fri Mar 29 2013 Richard W.M. Jones - 1:1.21.23-3 +- Add patch for broken 'file' command in Rawhide (RHBZ#928995). + * Thu Mar 28 2013 Richard W.M. Jones - 1:1.21.23-2 - New upstream version 1.21.23. - Remove 'Group' which is not required by modern RPM.