From 4b5ca7996492403bba7a73ac34d500d26c0a1bae240447b4a972c50460d800fa Mon Sep 17 00:00:00 2001 From: Jorik Cronenberg Date: Wed, 4 Jan 2023 13:53:34 +0000 Subject: [PATCH] Accepting request 1053381 from home:lnussel:usrmerge Replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1053381 OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=257 --- dhcp.changes | 5 +++++ dhcp.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dhcp.changes b/dhcp.changes index 6b5c410..495ffd7 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 10:32:19 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Fri Dec 9 07:42:59 UTC 2022 - Thorsten Kukuk diff --git a/dhcp.spec b/dhcp.spec index 5ea0299..aa8dd09 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -1,7 +1,7 @@ # # spec file for package dhcp # -# 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 @@ -21,7 +21,7 @@ %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 %define sbindir %{_sbindir} %else %define sbindir /sbin @@ -305,7 +305,7 @@ install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/dev install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/%{_lib} install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/run install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/db -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 # move the dhclient binary to /sbin mv -f %{buildroot}%{_sbindir}/dhclient %{buildroot}/sbin/ %endif