From 221ac3f1652c069bf5ba4e30bac30fdce9a63a8b Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: May 25 2023 09:58:53 +0000 Subject: Merge branch 'c9s-sig-hyperscale' into c8s-sig-hyperscale --- diff --git a/sources b/sources index 2e6e05e..43bb180 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (systemd-hs-252.4.tar.gz) = 9eaf3ee92ea0b39fa646be1372b1240b4f901af49e2facd3f87e5be740d4609ab34814d0772a99aada1e04c3b553ab05cef128fb295cfdd632aed33f8d07fa99 -SHA512 (systemd-hs+fb-252.4.tar.gz) = 95b4b07a9d3ee4ad90d65c5fecdc162b0729115ab24b78b93416a2b2d53e301660f173dc976d506aea7958937fd4a55d330b295d1941c25b8dae999dcfa4d071 +SHA512 (systemd-hs-252.4.tar.gz) = 89ec58da01429b83d6a2d80797ca140c2c40ab750198b2a8e395a9e94169882739b07aff21dfbb013b52241d9632b10354d2e9cbfed2fa05355440ff10c251a7 +SHA512 (systemd-hs+fb-252.4.tar.gz) = e6d971184ec03708e679355d0bda13d9315e0b9861ffd8e5d45905714eb27d738f006b92d68e7f05cbd73a6d9cbc49fa969b1ac0a572f668141fc8942ddd7e66 diff --git a/systemd.spec b/systemd.spec index 485b2ec..b3a5450 100644 --- a/systemd.spec +++ b/systemd.spec @@ -4,9 +4,9 @@ %global stable 1 %if 0%{?facebook} -%global hs_commit 90b17b51e8c4089f0b0d93aa437c2b4b1e3a8b67 +%global hs_commit 1d360fe852a59e3fd4253b234f72cc9bf28a1214 %else -%global hs_commit b2bf14d5dc581c4f111fe3edcea836bd317cad51 +%global hs_commit 41a7f97e13ba7bb986d97f6873fa3c3fe0808517 %endif # We ship a .pc file but don't want to have a dep on pkg-config. We @@ -37,7 +37,7 @@ Name: systemd Url: https://pagure.io/centos-sig-hyperscale/systemd %if %{without inplace} Version: 252.4 -Release: 598.12%{?dist} +Release: 598.13%{?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/') @@ -1134,6 +1134,9 @@ fi %changelog +* Thu May 25 2023 Daan De Meyer - 252.4-598.13 +- Backport https://github.com/systemd/systemd/pull/25385 + * Tue May 23 2023 Daan De Meyer - 252.4-598.12 - Remove selinux bcond in favor of boolean dependency on selinux-policy so that systemd-selinux is only installed if selinux-policy is installed