New upstream version 5.1.13.
- Remove patch, now upstream.
This commit is contained in:
parent
94ef0fd3bd
commit
0f834abf63
@ -1,36 +0,0 @@
|
|||||||
From baa22e783c31a693d95a2b7dd951ccc23663b831 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
||||||
Date: Mon, 16 Feb 2015 08:41:17 +0000
|
|
||||||
Subject: [PATCH] rpm: Prefer 'dnf download' over 'yumdownloader'.
|
|
||||||
|
|
||||||
Now that https://bugzilla.redhat.com/show_bug.cgi?id=1157233 has
|
|
||||||
been fixed, we can use 'dnf download' in parallel safely.
|
|
||||||
|
|
||||||
NB This requires hawkey >= 0.5.4 and dnf >= 0.6.5.
|
|
||||||
*Earlier versions will not work reliably*
|
|
||||||
---
|
|
||||||
src/rpm.ml | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/rpm.ml b/src/rpm.ml
|
|
||||||
index 838c109..4d31472 100644
|
|
||||||
--- a/src/rpm.ml
|
|
||||||
+++ b/src/rpm.ml
|
|
||||||
@@ -285,10 +285,10 @@ let rpm_get_all_files pkgs =
|
|
||||||
let rec fedora_download_all_packages pkgs dir =
|
|
||||||
let tdir = !settings.tmpdir // string_random8 () in
|
|
||||||
|
|
||||||
- if Config.yumdownloader <> "no" then
|
|
||||||
- fedora_download_all_packages_with_yum pkgs dir tdir
|
|
||||||
- else (* Config.dnf <> "no" *)
|
|
||||||
- fedora_download_all_packages_with_dnf pkgs dir tdir;
|
|
||||||
+ if Config.dnf <> "no" then
|
|
||||||
+ fedora_download_all_packages_with_dnf pkgs dir tdir
|
|
||||||
+ else (* Config.yumdownloader <> "no" *)
|
|
||||||
+ fedora_download_all_packages_with_yum pkgs dir tdir;
|
|
||||||
|
|
||||||
rpm_unpack tdir dir
|
|
||||||
|
|
||||||
--
|
|
||||||
2.3.1
|
|
||||||
|
|
@ -5,8 +5,8 @@
|
|||||||
|
|
||||||
Summary: Tool for creating supermin appliances
|
Summary: Tool for creating supermin appliances
|
||||||
Name: supermin
|
Name: supermin
|
||||||
Version: 5.1.12
|
Version: 5.1.13
|
||||||
Release: 11%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
|
|
||||||
%if 0%{?rhel} >= 7
|
%if 0%{?rhel} >= 7
|
||||||
@ -16,11 +16,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 to prefer 'dnf download' over yumdownloader.
|
|
||||||
# Since 'dnf download' was broken for a long time, this only works
|
|
||||||
# with the latest dnf (see dnf/hawkey version dependencies below).
|
|
||||||
Patch1: 0001-rpm-Prefer-dnf-download-over-yumdownloader.patch
|
|
||||||
|
|
||||||
BuildRequires: /usr/bin/pod2man
|
BuildRequires: /usr/bin/pod2man
|
||||||
BuildRequires: rpm
|
BuildRequires: rpm
|
||||||
BuildRequires: rpm-devel
|
BuildRequires: rpm-devel
|
||||||
@ -135,6 +130,10 @@ make check || {
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 26 2015 Richard W.M. Jones <rjones@redhat.com> - 5.1.13-1
|
||||||
|
- New upstream version 5.1.13.
|
||||||
|
- Remove patch, now upstream.
|
||||||
|
|
||||||
* Thu May 21 2015 Richard W.M. Jones <rjones@redhat.com> - 5.1.12-11
|
* Thu May 21 2015 Richard W.M. Jones <rjones@redhat.com> - 5.1.12-11
|
||||||
- Prefer 'dnf download' over 'yumdownloader' (again).
|
- Prefer 'dnf download' over 'yumdownloader' (again).
|
||||||
- BR grubby for the tests to work.
|
- BR grubby for the tests to work.
|
||||||
|
Loading…
Reference in New Issue
Block a user