diff --git a/.gitignore b/.gitignore index 65ed29c..504798f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /livecd-tools-24.4.tar.gz /livecd-tools-25.0.tar.gz /livecd-tools-26.0.tar.gz +/livecd-tools-26.1.tar.gz diff --git a/0001-imgcreate-dnfinst-Force-latest-packages-from-only-sp.patch b/0001-imgcreate-dnfinst-Force-latest-packages-from-only-sp.patch deleted file mode 100644 index 9dbc4ec..0000000 --- a/0001-imgcreate-dnfinst-Force-latest-packages-from-only-sp.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 30e6260c41a011241ed5659d2d85e72661807351 Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Sat, 24 Nov 2018 14:58:00 -0500 -Subject: [PATCH] imgcreate/dnfinst: Force latest packages from only specified - repos - -To ensure that the latest versions of things are picked for images, -we'll set 'best=1' and 'obsoletes=1', just as Mock does. - -And to make sure we don't have host system repos leak in, we'll set -'reposdir=/dev/null', too. ---- - imgcreate/dnfinst.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/imgcreate/dnfinst.py b/imgcreate/dnfinst.py -index 720dd7d..06a5b24 100644 ---- a/imgcreate/dnfinst.py -+++ b/imgcreate/dnfinst.py -@@ -73,9 +73,11 @@ class DnfLiveCD(dnf.Base): - conf += "plugins=1\n" - else: - conf += "plugins=0\n" -- conf += "reposdir=\n" -+ conf += "reposdir=/dev/null\n" - conf += "failovermethod=priority\n" - conf += "keepcache=1\n" -+ conf += "obsoletes=1\n" -+ conf += "best=1\n" - conf += "tsflags=nocontexts\n" - - f = open(confpath, "w+") --- -2.17.2 - diff --git a/livecd-tools.spec b/livecd-tools.spec index 6eed955..e88d14b 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -16,17 +16,14 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 26.0 -Release: 3%{?dist} +Version: 26.1 +Release: 1%{?dist} Epoch: 1 License: GPLv2 Group: System Environment/Base URL: https://github.com/livecd-tools/livecd-tools Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz -# Patches from upstream -Patch0001: 0001-imgcreate-dnfinst-Force-latest-packages-from-only-sp.patch - %if %{with python2} BuildRequires: python2-devel %endif @@ -225,6 +222,11 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-* %endif %changelog +* Sat Dec 08 2018 Neal Gompa - 1:26.1-1 +- Bump version to 26.1 (ngompa13) +- Run setfiles after chroot (noto.kazufumi) +- imgcreate/dnfinst: Force latest packages from only specified repos (ngompa13) + * Sat Nov 24 2018 Neal Gompa - 1:26.0-3 - Backport fix from upstream to ensure latest versions install - Fix extlinux dependency for EL7 diff --git a/sources b/sources index aeff9d3..e81d539 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (livecd-tools-26.0.tar.gz) = b32c7de5570693a91aebc46e33b04f51b83ababe58614da9c8961267e0ba8120615ff76c4e612d6afce6da5e6f24fb494076044c7340e26b20c8177fe99f7c41 +SHA512 (livecd-tools-26.1.tar.gz) = 240c13ec615b7c181227ad4223743f8221b27025184124001274d92c3a92c01755bf17fd91e86c5844535dc4e09387da1e2952faa004929d74a077850db9e8a6