- 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
This commit is contained in:
Franck Bui 2022-06-21 13:19:55 +00:00 committed by Git OBS Bridge
parent 637820eccd
commit be46e91756
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 21 13:15:12 UTC 2022 - Franck Bui <fbui@suse.com>
- 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 <fbui@suse.com> Wed Jun 8 10:11:12 UTC 2022 - Franck Bui <fbui@suse.com>

View File

@ -19,7 +19,7 @@
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%define min_kernel_version 4.5 %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 _testsuitedir /usr/lib/systemd/tests
%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
@ -156,7 +156,7 @@ Provides: systemd-analyze = %{version}-%{release}
Obsoletes: pm-utils <= 1.4.1 Obsoletes: pm-utils <= 1.4.1
Obsoletes: suspend <= 1.0 Obsoletes: suspend <= 1.0
Obsoletes: systemd-analyze < 201 Obsoletes: systemd-analyze < 201
Source0: systemd-v%{version}%{suse_version}.tar.xz Source0: systemd-v%{version}%{archive_version}.tar.xz
Source1: systemd-rpmlintrc Source1: systemd-rpmlintrc
Source2: systemd-user Source2: systemd-user
%if %{with sysvcompat} %if %{with sysvcompat}
@ -638,12 +638,12 @@ Have fun with these services at your own risk.
%endif %endif
%prep %prep
%autosetup -p1 -n systemd-v%{version}%{suse_version} %autosetup -p1 -n systemd-v%{version}%{archive_version}
%build %build
%meson \ %meson \
-Dmode=release \ -Dmode=release \
-Dversion-tag=%{version}%{suse_version} \ -Dversion-tag=%{version}%{archive_version} \
-Ddocdir=%{_docdir}/systemd \ -Ddocdir=%{_docdir}/systemd \
%if %{with split_usr} %if %{with split_usr}
-Drootprefix=/usr \ -Drootprefix=/usr \