diff --git a/0001-revert-tests-build-init-always-statically.patch b/0001-revert-tests-build-init-always-statically.patch deleted file mode 100644 index 6000c58..0000000 --- a/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/crun.spec b/crun.spec index dc3b1e4..8c735c6 100644 --- a/crun.spec +++ b/crun.spec @@ -1,7 +1,7 @@ Summary: OCI runtime written in C Name: crun -Version: 0.18 -Release: 2%{?dist} +Version: 0.19 +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+ @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib* %{_mandir}/man1/* %changelog +* Tue Apr 06 2021 Jindrich Novy - 0.19-1 +- update to https://github.com/containers/crun/releases/tag/0.19 + * Fri Feb 19 2021 Jindrich Novy - 0.18-2 - allow to build without glibc-static (thanks to Giuseppe Scrivano) diff --git a/sources b/sources index 8fdc941..ee80c47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-0.18.tar.gz) = 94610d9d4ef95a9be708c6cf8cc38587c9c3b847d9da5cf9dfa4a2eddddb7e6724e39ffb222ed5d6c61bad8374ae50dc9e92d95b6d03ce0b185d5123afeeca46 +SHA512 (crun-0.19.tar.gz) = a23230307cba6c1348e4bb6fed3553f94409c2a667b38198b896955fa0dcb9c2d890c1b85bd240f5f9806f6dd3595c06333f8c672244776c07e25b7f633084a7