From 06a09b755e19bfb74cb03fdefc5968108117a3f02bbfcbea78f0e0c8d32dbf88 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 9 Jan 2023 10:18:38 +0000 Subject: [PATCH] Accepting request 1055743 from home:lnussel:usrmerge Replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1055743 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=257 --- powerd.changes | 5 +++++ powerd.spec | 2 +- sysvinit.changes | 5 +++++ sysvinit.spec | 4 ++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/powerd.changes b/powerd.changes index 17d4a7a..0e346cb 100644 --- a/powerd.changes +++ b/powerd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 4 11:13:33 UTC 2023 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Thu Oct 21 11:29:51 UTC 2021 - Dr. Werner Fink diff --git a/powerd.spec b/powerd.spec index ca3667b..69ff467 100644 --- a/powerd.spec +++ b/powerd.spec @@ -16,7 +16,7 @@ # -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 %define sbindir %_sbindir %else %define sbindir /sbin diff --git a/sysvinit.changes b/sysvinit.changes index 41a1f0c..7c9d164 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 4 11:13:37 UTC 2023 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Sat May 7 12:20:53 UTC 2022 - Marcus Meissner diff --git a/sysvinit.spec b/sysvinit.spec index 724fd20..3a18c58 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -16,7 +16,7 @@ # -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 %define sbindir %_sbindir %define bindir %_bindir %else @@ -115,7 +115,7 @@ popd # pidof is part of procps-ng; let's remove the symlinks to killproc5 here rm -f %{buildroot}{/sbin,/bin,%{_mandir}/man8}/pidof{,.8} %endif -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 # it's all hardcoded in Makefiles so move here mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_sbindir}