From be46e917567a63e7617d443f480f2e000798eb3596db44c941440e18bc264f49 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 21 Jun 2022 13:19:55 +0000 Subject: [PATCH] - spec: %suse_version rpm macro is already reserved and has a special meaning in openSUSE distros so rename it to %archive_version instead. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1289 --- systemd.changes | 6 ++++++ systemd.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/systemd.changes b/systemd.changes index 7ca5fb87..0f88a51e 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 21 13:15:12 UTC 2022 - Franck Bui + +- spec: %suse_version rpm macro is already reserved and has a special meaning in + openSUSE distros so rename it to %archive_version instead. + ------------------------------------------------------------------- Wed Jun 8 10:11:12 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 12703af0..06a5e46f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define suse_version +suse.21.ge9fc337d97 +%define archive_version +suse.21.ge9fc337d97 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -156,7 +156,7 @@ Provides: systemd-analyze = %{version}-%{release} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 Obsoletes: systemd-analyze < 201 -Source0: systemd-v%{version}%{suse_version}.tar.xz +Source0: systemd-v%{version}%{archive_version}.tar.xz Source1: systemd-rpmlintrc Source2: systemd-user %if %{with sysvcompat} @@ -638,12 +638,12 @@ Have fun with these services at your own risk. %endif %prep -%autosetup -p1 -n systemd-v%{version}%{suse_version} +%autosetup -p1 -n systemd-v%{version}%{archive_version} %build %meson \ -Dmode=release \ - -Dversion-tag=%{version}%{suse_version} \ + -Dversion-tag=%{version}%{archive_version} \ -Ddocdir=%{_docdir}/systemd \ %if %{with split_usr} -Drootprefix=/usr \