diff --git a/0001-meson-allow-oomd-to-be-enabled-even-in-release-mode.patch b/0001-meson-allow-oomd-to-be-enabled-even-in-release-mode.patch deleted file mode 100644 index 04a8e5f..0000000 --- a/0001-meson-allow-oomd-to-be-enabled-even-in-release-mode.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fe1781d10dd8734af21dbea8c070069829456c03 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Thu, 12 Nov 2020 13:05:05 +0100 -Subject: [PATCH] meson: allow oomd to be enabled even in release mode - -A distro (Fedora in particular) may want to enable oomd in a unstable -branch for testing, even though the package as a whole is compiled in release -mode. Let's emit a warning but otherwise allow this. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 7996bc2c65..43e328f5a6 100644 ---- a/meson.build -+++ b/meson.build -@@ -1419,7 +1419,7 @@ if have == 'auto' - else - have = have == 'true' - if have and get_option('mode') != 'developer' -- error('oomd is not available in release mode (yet)') -+ warning('oomd is not ready for release mode (yet)') - endif - endif - conf.set10('ENABLE_OOMD', have) diff --git a/sources b/sources index 741f542..f672e70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-247-rc2.tar.gz) = 01fb347f3edb08efdf97b54339b381e4747377af08528f7267e6de6e85215025f81da13f822fcd9b449891b925aa163c6755dea86e6727b626ea27c19e5f391b +SHA512 (systemd-247.tar.gz) = dd11cf46e5d9cbf44beb2d383262e9b13eb80fbb3403d86d011b4c2f9e0a4778c7c9779c856960f5654177581c20d7336c00ce687d35fe35ce069c56924604c2 diff --git a/systemd.spec b/systemd.spec index 863aaed..dafb304 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,7 +20,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd -Version: 247~rc2 +Version: 247 Release: 1%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ @@ -71,7 +71,6 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[ # https://bugzilla.redhat.com/show_bug.cgi?id=1738828 Patch0001: use-bfq-scheduler.patch -Patch0002: 0001-meson-allow-oomd-to-be-enabled-even-in-release-mode.patch Patch0003: 0001-test-path-util-do-not-fail-if-the-fd_is_mount_point-.patch Patch0004: 0001-test-path-util-ignore-test-failure.patch @@ -893,6 +892,10 @@ getent passwd systemd-network &>/dev/null || useradd -r -u 192 -l -g systemd-net %files standalone-sysusers -f .file-list-standalone-sysusers %changelog +* Thu Nov 26 2020 Zbigniew Jędrzejewski-Szmek - 247-1 +- Update to the latest version +- #1900878 should be fixed + * Tue Oct 20 2020 Zbigniew Jędrzejewski-Szmek - 247~rc2 - New upstream pre-release. See https://github.com/systemd/systemd/blob/v247-rc1/NEWS.