Accepting request 1055819 from network:dhcp

OBS-URL: https://build.opensuse.org/request/show/1055819
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dhcp?expand=0&rev=138

dhcp.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 10:32:19 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Fri Dec  9 07:42:59 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
 

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