pool/iputils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1054772 from home:lnussel:usrmerge

Browse Source 
Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1054772
OBS-URL: https://build.opensuse.org/package/show/network:utilities/iputils?expand=0&rev=106
This commit is contained in:
Petr Vorel 2023-01-04 16:34:02 +00:00 committed by Git OBS Bridge
parent db5feaf13b
commit 1a28b4c3a6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iputils.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 12:27:43 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 26 00:10:00 UTC 2022 - Petr Vorel <pvorel@suse.cz> Sat Nov 26 00:10:00 UTC 2022 - Petr Vorel <pvorel@suse.cz>

6
iputils.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package iputils # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # symlink to man tracepath6(8)
ln -sf %{_mandir}/man8/tracepath.8%{ext_man} %{buildroot}%{_mandir}/man8/tracepath6.8%{ext_man} 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/* # We still have reverse dependencies using /sbin/* or /bin/*
# so keep these symlinks for now. They are slowly being fixed # so keep these symlinks for now. They are slowly being fixed
# but lets not just break them yet. # but lets not just break them yet.
@ -98,7 +98,7 @@ ln -sf %{_bindir}/tracepath6 %{buildroot}/bin
%{_bindir}/tracepath %{_bindir}/tracepath
%{_bindir}/tracepath6 %{_bindir}/tracepath6
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/bin/arping /bin/arping
/bin/clockdiff /bin/clockdiff
/bin/ping /bin/ping