New upstream version 5.1.10.

- Remove patch which is now included upstream.
This commit is contained in:
Richard W.M. Jones 2014-09-04 16:17:37 +01:00
parent 4442996b87
commit a82b32b7a4
3 changed files with 7 additions and 41 deletions

View File

@ -1,33 +0,0 @@
From 42bca7636dadc2ae5ceed47327cc65e772a81834 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 3 Aug 2014 17:15:42 +0100
Subject: [PATCH] build: Another corner case in munge function.
In Rawhide, /media is now a pointer to /run/media which does
not exist.
This caused us to loop indefinitely in the final case, calling
loop ("/" :: "/media" :: rest)
because "/" was never marked as "seen". Marking it as seen was the
simplest way to break this loop.
---
src/build.ml | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/build.ml b/src/build.ml
index 2a28a3f..8ff574b 100644
--- a/src/build.ml
+++ b/src/build.ml
@@ -376,6 +376,7 @@ and munge files =
| { ft_path = "/" } :: rest ->
(* This is just to avoid a corner-case in subsequent rules. *)
+ insert_dir "/";
loop rest
| dir :: rest when stat_is_dir dir.ft_path && dir_seen dir.ft_path ->
--
2.0.4

View File

@ -1 +1 @@
c362d302e32099caed1c5678619467a7 supermin-5.1.9.tar.gz 55af45d471987cde51cac4b4181073c5 supermin-5.1.10.tar.gz

View File

@ -1,7 +1,7 @@
Summary: Tool for creating supermin appliances Summary: Tool for creating supermin appliances
Name: supermin Name: supermin
Version: 5.1.9 Version: 5.1.10
Release: 3%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
@ -11,9 +11,6 @@ ExclusiveArch: x86_64
URL: http://people.redhat.com/~rjones/supermin/ URL: http://people.redhat.com/~rjones/supermin/
Source0: http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz Source0: http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz
# Upstream patch which avoids endless loop in Rawhide.
Patch1: 0001-build-Another-corner-case-in-munge-function.patch
BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2man
BuildRequires: rpm BuildRequires: rpm
BuildRequires: yum-utils BuildRequires: yum-utils
@ -55,8 +52,6 @@ second when you need to boot one of them.
%prep %prep
%setup -q %setup -q
%patch1 -p1
%build %build
%configure --disable-network-tests %configure --disable-network-tests
@ -89,6 +84,10 @@ make check || {
%changelog %changelog
* Thu Sep 4 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.10-1
- New upstream version 5.1.10.
- Remove patch which is now included upstream.
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.9-3 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild