diff --git a/iputils.changes b/iputils.changes index fc202ed..cfb147a 100644 --- a/iputils.changes +++ b/iputils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 12:27:43 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Sat Nov 26 00:10:00 UTC 2022 - Petr Vorel diff --git a/iputils.spec b/iputils.spec index 20b38b3..9ed8449 100644 --- a/iputils.spec +++ b/iputils.spec @@ -1,7 +1,7 @@ # # spec file for package iputils # -# 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 @@ -68,7 +68,7 @@ ln -sf %{_bindir}/tracepath %{buildroot}/%{_bindir}/tracepath6 # symlink to man tracepath6(8) ln -sf %{_mandir}/man8/tracepath.8%{ext_man} %{buildroot}%{_mandir}/man8/tracepath6.8%{ext_man} -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 # We still have reverse dependencies using /sbin/* or /bin/* # so keep these symlinks for now. They are slowly being fixed # but lets not just break them yet. @@ -98,7 +98,7 @@ ln -sf %{_bindir}/tracepath6 %{buildroot}/bin %{_bindir}/tracepath %{_bindir}/tracepath6 -%if !0%{?usrmerged} +%if 0%{?suse_version} < 1550 /bin/arping /bin/clockdiff /bin/ping