diff --git a/.crun.metadata b/.crun.metadata index 8265173..2927668 100644 --- a/.crun.metadata +++ b/.crun.metadata @@ -1 +1 @@ -c79a414d0b980611ba929a7526b7b4c30c2b3b1d SOURCES/crun-0.18.tar.gz +48a601d8126bbd97972dbc52bd766e6d28f6595d SOURCES/crun-0.20.1.tar.gz diff --git a/.gitignore b/.gitignore index 8a10d4c..cecde1e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/crun-0.18.tar.gz +SOURCES/crun-0.20.1.tar.gz diff --git a/SOURCES/0001-revert-tests-build-init-always-statically.patch b/SOURCES/0001-revert-tests-build-init-always-statically.patch deleted file mode 100644 index 6000c58..0000000 --- a/SOURCES/0001-revert-tests-build-init-always-statically.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 320a7ec41342c95fd6bdc500cd207eb0ea5cda6a Mon Sep 17 00:00:00 2001 -From: Giuseppe Scrivano -Date: Fri, 19 Feb 2021 13:25:37 +0100 -Subject: [PATCH] Revert "tests: build init always statically" - -This reverts commit a0f322a49a10a014a447b505eda5923a8e6aff7c as it -causes issues on RHEL 8. - -Signed-off-by: Giuseppe Scrivano ---- - Makefile.am | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index e39dc3b..2b8e18b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -14,7 +14,7 @@ srpm: dist-gzip rpm/crun.spec - $(MAKE) -C $(WD) dist-gzip - rpmbuild -bs --define "_sourcedir $(WD)" --define "_specdir $(WD)" --define "_builddir $(WD)" --define "_srcrpmdir $(WD)" --define "_rpmdir $(WD)" --define "_buildrootdir $(WD)/.build" rpm/crun.spec - --CLEANFILES = crun.spec tests/init -+CLEANFILES = crun.spec - - lib_LTLIBRARIES = libcrun.la - -@@ -79,9 +79,9 @@ noinst_PROGRAMS = tests/init $(UNIT_TESTS) - - TESTS_LDADD = libcrun_testing.a $(FOUND_LIBS) - --tests/init: tests/init.c -- $(CC) -static-libgcc --static -o $@ $< --EXTRA_DIST += tests/init.c -+tests_init_LDADD = -+tests_init_LDFLAGS = -static-libgcc -all-static -+tests_init_SOURCES = tests/init.c $(UNIT_TESTS) - - tests_tests_libcrun_utils_CFLAGS = -I $(abs_top_builddir)/libocispec/src -I $(abs_top_srcdir)/libocispec/src -I $(abs_top_builddir)/src -I $(abs_top_srcdir)/src - tests_tests_libcrun_utils_SOURCES = tests/tests_libcrun_utils.c --- -2.29.2 - - diff --git a/SPECS/crun.spec b/SPECS/crun.spec index 016f6e4..58e7ba0 100644 --- a/SPECS/crun.spec +++ b/SPECS/crun.spec @@ -1,9 +1,8 @@ Summary: OCI runtime written in C Name: crun -Version: 0.18 -Release: 2%{?dist} +Version: 0.20.1 +Release: 1%{?dist} Source0: https://github.com/containers/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-revert-tests-build-init-always-statically.patch License: GPLv2+ URL: https://github.com/containers/crun # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures @@ -47,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Thu Jul 01 2021 Jindrich Novy - 0.20.1-1 +- update to https://github.com/containers/crun/releases/tag/0.20.1 +- Related: #1954702 + * Thu May 13 2021 Jindrich Novy - 0.18-2 - revert back to the state of 3.0-8.4.0 - Related: #1954702