From ad63cd0d260427da5fd95058634fb616df50d867486726d76c1506677a9bae99 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Thu, 5 Jan 2023 22:03:44 +0000 Subject: [PATCH] Accepting request 1053507 from home:lnussel:usrmerge - Replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1053507 OBS-URL: https://build.opensuse.org/package/show/Base:System/dmraid?expand=0&rev=64 --- dmraid.changes | 5 +++++ dmraid.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dmraid.changes b/dmraid.changes index a66b54e..4b6e417 100644 --- a/dmraid.changes +++ b/dmraid.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 10:33:15 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Tue May 17 07:54:00 UTC 2022 - Ferdinand Thiessen diff --git a/dmraid.spec b/dmraid.spec index 318b86e..3faafb2 100644 --- a/dmraid.spec +++ b/dmraid.spec @@ -1,7 +1,7 @@ # # spec file for package dmraid # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 %define sbindir %_sbindir %else %define sbindir /sbin @@ -110,7 +110,7 @@ autoreconf -fi rm -r autom4te.cache %configure \ --with-usrlibdir=%{_libdir} \ -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 --sbindir=%{sbindir} \ %endif --with-user=`id -nu` --with-group=`id -ng` \