From eb2a088ed93c204158b399446df535f271447b35ef07dbc0067e99a67bea1bf1 Mon Sep 17 00:00:00 2001 From: Coly Li Date: Tue, 25 Jul 2023 06:12:22 +0000 Subject: [PATCH] Accepting request 1100437 from home:lnussel:usrmerge - mdadm.spec: replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1100437 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=227 --- mdadm.changes | 6 ++++++ mdadm.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mdadm.changes b/mdadm.changes index 0c16702..93c05b7 100644 --- a/mdadm.changes +++ b/mdadm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 24 15:31:30 UTC 2023 - Ludwig Nussel + +- mdadm.spec: replace transitional %usrmerged macro with regular + version check (boo#1206798) + ------------------------------------------------------------------- Fri May 26 02:29:42 UTC 2023 - Coly Li diff --git a/mdadm.spec b/mdadm.spec index 2a501d0..9a91da4 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -197,7 +197,7 @@ install -m 644 %{S:2} %{buildroot}%{_fillupdir}/ install -d %{buildroot}%{_systemdshutdowndir} install -d %{buildroot}%{_sbindir} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcmdmonitor -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 mkdir -p %{buildroot}/sbin ln -s %{_sbindir}/mdadm %{buildroot}/sbin/mdadm ln -s %{_sbindir}/mdmon %{buildroot}/sbin/mdmon @@ -230,7 +230,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcmdmonitor %doc Software-RAID.HOWTO/Software-RAID.HOWTO*{.txt,.html} %doc %{_mandir}/man?/* %{_sbindir}/* -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /sbin/mdadm /sbin/mdmon %endif