From 32d9d1e7a64fee48911a4c7e991d5fa69b183689 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 13 Aug 2019 20:32:20 +0000 Subject: [PATCH 1/2] scripts: Use correct spec file for new-rpm-release Signed-off-by: Eli Uriegas --- scripts/new-rpm-release | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/new-rpm-release b/scripts/new-rpm-release index e874beb5..eb5b0f8f 100755 --- a/scripts/new-rpm-release +++ b/scripts/new-rpm-release @@ -16,9 +16,7 @@ RPM_VERSION=$(echo "${RPM_VER_BITS}" | cut -f1 -d' ') RPM_RELEASE_VERSION=$(echo "${RPM_VER_BITS}" | cut -f2 -d' ' | sed 's/\.[0-9]*$//') RPM_ITERATION=1 -echo "$RPM_RELEASE_VERSION" - -while grep "$RPM_VERSION-$RPM_RELEASE_VERSION.$RPM_ITERATION" rpm/runc.spec >/dev/null 2>&1;do +while grep "$RPM_VERSION-$RPM_RELEASE_VERSION.$RPM_ITERATION" "${SPEC_FILE}" >/dev/null 2>&1;do ((++RPM_ITERATION)) done From 24430fb2cba1d038f9b5c115bae1b8f42d340dbd Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 13 Aug 2019 20:32:42 +0000 Subject: [PATCH 2/2] rpm: Do not provides runc on rhel 8 Signed-off-by: Eli Uriegas --- rpm/containerd.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rpm/containerd.spec b/rpm/containerd.spec index 3bdd55fd..2d0e271b 100644 --- a/rpm/containerd.spec +++ b/rpm/containerd.spec @@ -30,7 +30,10 @@ AutoReq: no Name: containerd.io Provides: containerd +# For some reason on rhel 8 if we "provide" runc then it makes this package unsearchable +%if 0%{!?el8:1} Provides: runc +%endif # Obsolete packages Obsoletes: containerd @@ -151,6 +154,9 @@ install -p -m 644 man/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5 %changelog +* Tue Aug 13 2019 Eli Uriegas - 1.2.6-3.4 +- Do not "Provides: runc" for RHEL 8 + * Tue Jun 11 2019 Kir Kolyshkin - 1.2.6-3.3 - add requirement for container-selinux - move runc binary to %_bindir