diff --git a/net-tools.changes b/net-tools.changes index 85a1060..43bc7a9 100644 --- a/net-tools.changes +++ b/net-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 13:12:55 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Sun Jan 24 18:04:26 UTC 2021 - Dirk Müller diff --git a/net-tools.spec b/net-tools.spec index ef040b0..082c8cc 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -84,7 +84,7 @@ for tool in iptunnel ipmaddr; do help2man -s8 "%{buildroot}%{_sbindir}/${tool}" --no-discard-stderr >"${t}" done # generate bin/sbin compat symlinks -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 mkdir -p %{buildroot}/sbin mkdir -p %{buildroot}/bin for i in ether-wake nameif plipconfig slattach arp ipmaddr iptunnel; do @@ -103,7 +103,7 @@ done %{_sbindir}/nameif %{_sbindir}/plipconfig %{_sbindir}/slattach -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /sbin/ether-wake /sbin/nameif /sbin/plipconfig @@ -126,7 +126,7 @@ done %{_bindir}/ifconfig %{_bindir}/netstat %{_bindir}/route -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /bin/ifconfig /bin/netstat /bin/route