New upstream version 5.1.1.

- Remove patch which is now upstream.
This commit is contained in:
Richard W.M. Jones 2014-03-01 09:47:01 +00:00
parent be53af1d3d
commit 7610a1186a
4 changed files with 7 additions and 50 deletions

1
.gitignore vendored
View File

@ -4,5 +4,4 @@
/.build-*.log
/clog
/supermin-*.tar.gz
/supermin-4*
/x86_64

View File

@ -1,42 +0,0 @@
From 8ae7752efb0c771288d308772b24e16e370d9d40 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 26 Feb 2014 21:29:01 +0000
Subject: [PATCH] prepare: Remove duplicates from packages file.
---
src/prepare.ml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/prepare.ml b/src/prepare.ml
index 7dc26ec..4f7d6a1 100644
--- a/src/prepare.ml
+++ b/src/prepare.ml
@@ -50,10 +50,15 @@ let prepare debug (copy_kernel, dtb_wildcard, format, host_cpu,
flush stdout
);
- (* Write packages file - after removing missing packages, but before
- * resolving dependencies.
+ (* Convert input packages to a set. This removes duplicates. *)
+ let packages = package_set_of_list packages in
+
+ (* Write input packages to the 'packages' file. We don't need to
+ * write the dependencies because we do dependency resolution at
+ * build time too.
*)
let () =
+ let packages = PackageSet.elements packages in
let pkg_names = List.map ph.ph_package_name packages in
let pkg_names = List.sort compare pkg_names in
@@ -67,7 +72,6 @@ let prepare debug (copy_kernel, dtb_wildcard, format, host_cpu,
(* Resolve the dependencies. *)
let packages =
- let packages = package_set_of_list packages in
ph.ph_get_all_requires packages in
if debug >= 1 then (
--
1.8.5.3

View File

@ -1 +1 @@
16033ada033af38bc9312d57906c7769 supermin-5.1.0.tar.gz
bef271fa1d7b0dd53a1b3739d715aafb supermin-5.1.1.tar.gz

View File

@ -1,7 +1,7 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.1.0
Release: 3%{?dist}
Version: 5.1.1
Release: 1%{?dist}
License: GPLv2+
%if 0%{?rhel} >= 7
@ -11,8 +11,6 @@ ExclusiveArch: x86_64
URL: http://people.redhat.com/~rjones/supermin/
Source0: http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz
Patch1: 0001-prepare-Remove-duplicates-from-packages-file.patch
BuildRequires: /usr/bin/pod2man
BuildRequires: rpm
BuildRequires: yum-utils
@ -47,8 +45,6 @@ second when you need to boot one of them.
%prep
%setup -q
%patch1 -p1
%build
# Use --disable-largefile to work around glibc bug:
@ -84,6 +80,10 @@ make check
%changelog
* Sat Mar 1 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.1-1
- New upstream version 5.1.1.
- Remove patch which is now upstream.
* Wed Feb 26 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.0-3
- Add BR yum-utils (for yumdownloader).
- Add upstream patch which stops duplicate packages appearing.