From 4c604f428c7c88bafd7b70c36258ecffccb80407 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Apr 13 2022 19:01:44 +0000 Subject: 250.3-6.6: Fix bug in split-files.py --- diff --git a/split-files.py b/split-files.py index c7cfed4..f855093 100644 --- a/split-files.py +++ b/split-files.py @@ -9,13 +9,14 @@ networkd_regex = r''' /usr/lib/systemd/network/80-| networkd| networkctl| - org.freedesktop.network1 + org\.freedesktop\.network1 ''' if release == "8": networkd_regex += r'''| - systemd.netdev| - systemd.network| + systemd\.netdev| + systemd\.network| + systemd-network\.conf| systemd-network-generator ''' diff --git a/systemd.spec b/systemd.spec index 2a8715a..f9f2db6 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.5%{?dist} +Release: 6.6%{?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/') @@ -1078,6 +1078,11 @@ fi %endif %changelog +* Wed Apr 13 2022 Daan De Meyer - 250.3-6.6 +- Fixed bug in networkd changes to split-files.py that caused the + /etc/systemd/network to get moved to the networkd package (which we don't + want because that's where link files for udev are also stored). + * Wed Apr 6 2022 Daan De Meyer - 250.3-6.5 - Backport systemd-analyze verify regression fix