From 35a0fb2e2c6a1e1e2a0c1aed2b442eac7fcea156140a3499f4daa0abd1c01cc0 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 2 Oct 2024 12:23:37 +0000 Subject: [PATCH 1/2] - Clean up some remnants from when homed was in the experimental sub-package (bsc#1231048) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1557 --- systemd.changes | 5 +++++ systemd.spec | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/systemd.changes b/systemd.changes index af5568c4..bbb98829 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 2 12:03:48 UTC 2024 - Franck Bui + +- Clean up some remnants from when homed was in the experimental sub-package (bsc#1231048) + ------------------------------------------------------------------- Wed Sep 18 09:31:40 UTC 2024 - Franck Bui diff --git a/systemd.spec b/systemd.spec index ca4d86df..8f7770c5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1340,22 +1340,18 @@ fi %if %{with experimental} %pre experimental -%systemd_pre systemd-homed.service %systemd_pre systemd-oomd.service systemd-oomd.socket %post experimental %if %{without filetriggers} %sysusers_create systemd-oom.conf %endif -%systemd_post systemd-homed.service %systemd_post systemd-oomd.service systemd-oomd.socket %preun experimental -%systemd_preun systemd-homed.service %systemd_preun systemd-oomd.service systemd-oomd.socket %postun experimental -%systemd_postun systemd-homed.service %systemd_postun systemd-oomd.service systemd-oomd.socket %endif From 85f41f6d79d9c794b54cd5bed61bac3e703769a951305b368d75682327cea107 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 8 Oct 2024 16:33:58 +0000 Subject: [PATCH 2/2] - Import commit c7671762b39ead7f8f9e70064256f5efaccedeca (merge of v256.7) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/8a0ae4d90aff1d067a125ff9366eafc7dd5d4701...c7671762b39ead7f8f9e70064256f5efaccedeca OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1558 --- systemd-v256.6+suse.8.g8a0ae4d90a.tar.xz | 3 --- systemd-v256.7+suse.9.gc7671762b3.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 systemd-v256.6+suse.8.g8a0ae4d90a.tar.xz create mode 100644 systemd-v256.7+suse.9.gc7671762b3.tar.xz diff --git a/systemd-v256.6+suse.8.g8a0ae4d90a.tar.xz b/systemd-v256.6+suse.8.g8a0ae4d90a.tar.xz deleted file mode 100644 index bc9561f3..00000000 --- a/systemd-v256.6+suse.8.g8a0ae4d90a.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a15e24ad80599e64d66ff042ffbc9cc4addcbdd9a1a7bafde26fd17d65140d3 -size 11235516 diff --git a/systemd-v256.7+suse.9.gc7671762b3.tar.xz b/systemd-v256.7+suse.9.gc7671762b3.tar.xz new file mode 100644 index 00000000..9c951323 --- /dev/null +++ b/systemd-v256.7+suse.9.gc7671762b3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33ef4af462456a5e27e84cd4baeb567ce36eb53ee8a476a3995996ed0bd66e77 +size 11237156 diff --git a/systemd.changes b/systemd.changes index bbb98829..830f4af8 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Oct 8 16:21:49 UTC 2024 - Franck Bui + +- Import commit c7671762b39ead7f8f9e70064256f5efaccedeca (merge of v256.7) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/8a0ae4d90aff1d067a125ff9366eafc7dd5d4701...c7671762b39ead7f8f9e70064256f5efaccedeca + ------------------------------------------------------------------- Wed Oct 2 12:03:48 UTC 2024 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 8f7770c5..ddafbf0d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -26,9 +26,9 @@ %define systemd_release %{?release_override}%{!?release_override:0} %define archive_version %{nil} %else -%define systemd_version 256.6 +%define systemd_version 256.7 %define systemd_release 0 -%define archive_version +suse.8.g8a0ae4d90a +%define archive_version +suse.9.gc7671762b3 %endif %define systemd_major %{sub %systemd_version 1 3}