From 8595a3ad79e6682132710ed3e10d717e3e18e969 Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Aug 31 2022 06:38:32 +0000 Subject: 251.4-1.3: Fix split-files.py regex for networkd files on non-C8 --- diff --git a/split-files.py b/split-files.py index 91054f9..2fbc347 100644 --- a/split-files.py +++ b/split-files.py @@ -92,7 +92,10 @@ for file in files(buildroot): tmpfiles\.d/systemd-network.conf| systemd\.network| systemd\.netdev - ''' + r'|systemd-network-generator' if release == "8" else r'', n, re.X): + ''', n, re.X): + o = o_networkd + + elif re.search(r'systemd-network-generator', n, re.X) and release == "8": o = o_networkd elif '.so.' in n: diff --git a/systemd.spec b/systemd.spec index 851ba0d..dc21f04 100644 --- a/systemd.spec +++ b/systemd.spec @@ -43,7 +43,7 @@ Name: systemd Url: https://pagure.io/centos-sig-hyperscale/systemd %if %{without inplace} Version: 251.4 -Release: 1.2%{?dist} +Release: 1.3%{?dist} %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') @@ -1112,6 +1112,9 @@ fi %changelog +* Wed Aug 31 2022 Anita Zhang - 251.4-1.3 +- Fix split-files.py regex for networkd files on non-C8 + * Thu Aug 18 2022 Anita Zhang - 251.4-1.2 - Revert 32-bit offsets journal commit from hs+fb build