diff --git a/split-files.py b/split-files.py index 9614c07..3d410fd 100644 --- a/split-files.py +++ b/split-files.py @@ -80,7 +80,10 @@ for file in files(buildroot): elif re.search(r'''/usr/lib/systemd/network/80-| networkd| networkctl| - org.freedesktop.network1 + org.freedesktop.network1| + systemd.netdev| + systemd.network| + systemd-network-generator ''', n, re.X): o = o_networkd elif '.so.' in n: diff --git a/systemd.spec b/systemd.spec index 1c06077..76c9bb2 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: 250.3 -Release: 6.2%{?dist} +Release: 6.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/') @@ -1067,6 +1067,10 @@ fi %endif %changelog +* Wed Apr 01 2022 Daan De Meyer - 250.3-6.3 +- Move systemd-network-generator and networkd man pages to networkd package to + avoid conflicts with systemd-extras from EPEL + * Wed Mar 16 2022 Daan De Meyer - 250.3-6.2 - Backport PR #22757: BPF error logging improvements