From bbea6a0733f8cd6336dd8ea13e50d4eeacfa4f9e3872a6479f6364124bddd9c0 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 17 Nov 2021 12:27:43 +0000 Subject: [PATCH 1/2] - Introduce %_systemd_util_dir It's a backport of upstream commit 3bc66bfa0136e370a8f7b06c3b69a52f5636ef82. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=72 --- macros.systemd | 1 + systemd-rpm-macros.changes | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/macros.systemd b/macros.systemd index 8be5606..6cc72d1 100644 --- a/macros.systemd +++ b/macros.systemd @@ -26,6 +26,7 @@ # should be preferred unless the package is intended to be portable # across multiple distributions based on RPM. +%_systemd_util_dir /usr/lib/systemd %_unitdir /usr/lib/systemd/system %_userunitdir /usr/lib/systemd/user %_presetdir /usr/lib/systemd/system-preset diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes index 7bed781..02d4a26 100644 --- a/systemd-rpm-macros.changes +++ b/systemd-rpm-macros.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 17 12:25:15 UTC 2021 - Franck Bui + +- Introduce %_systemd_util_dir + + It's a backport of upstream commit 3bc66bfa0136e370a8f7b06c3b69a52f5636ef82. + ------------------------------------------------------------------- Wed Sep 29 11:27:11 UTC 2021 - Dominique Leuenberger From 6f9fe0af97b90914a79e5bd3b1c931183dcf074f3c46282565dca3d78eea886a Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 17 Nov 2021 12:31:01 +0000 Subject: [PATCH 2/2] - Bump version to 14 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=73 --- systemd-rpm-macros.changes | 5 +++++ systemd-rpm-macros.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes index 02d4a26..e28e347 100644 --- a/systemd-rpm-macros.changes +++ b/systemd-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 17 12:28:16 UTC 2021 - Franck Bui + +- Bump version to 14 + ------------------------------------------------------------------- Wed Nov 17 12:25:15 UTC 2021 - Franck Bui diff --git a/systemd-rpm-macros.spec b/systemd-rpm-macros.spec index 70b456a..7e0b9ed 100644 --- a/systemd-rpm-macros.spec +++ b/systemd-rpm-macros.spec @@ -17,7 +17,7 @@ Name: systemd-rpm-macros -Version: 13 +Version: 14 Release: 0 Summary: RPM macros for systemd License: LGPL-2.1-or-later