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

Accepting request 849616 from home:lnussel:usrmove

Browse Source 
- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849616
OBS-URL: https://build.opensuse.org/package/show/network:utilities/iputils?expand=0&rev=90
This commit is contained in:
Petr Vorel 2020-11-20 10:37:09 +00:00 committed by Git OBS Bridge
parent 278c1770a5
commit c061fdda8a
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iputils.changes
View File

@ -4,6 +4,11 @@ Mon Oct 19 12:17:49 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Reference meson's build subdirectory as %_vpath_builddir, to - Reference meson's build subdirectory as %_vpath_builddir, to
line up with meson's structure. line up with meson's structure.
-------------------------------------------------------------------
Fri Oct 16 09:57:32 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 7 12:16:44 UTC 2020 - Matthias Gerstner <matthias.gerstner@suse.com> Wed Oct 7 12:16:44 UTC 2020 - Matthias Gerstner <matthias.gerstner@suse.com>

13
iputils.spec
View File

@ -91,7 +91,7 @@ install -Dpm 0644 %_vpath_builddir/rarpd@.service %{buildroot}/%{_unitdir}
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrarpd ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrarpd
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrdisc ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrdisc
#UsrMerge %if !0%{?usrmerged}
# 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.
@ -104,7 +104,7 @@ ln -sf %{_bindir}/ping %{buildroot}/bin
ln -sf %{_bindir}/ping6 %{buildroot}/bin ln -sf %{_bindir}/ping6 %{buildroot}/bin
ln -sf %{_bindir}/tracepath %{buildroot}/bin ln -sf %{_bindir}/tracepath %{buildroot}/bin
ln -sf %{_bindir}/tracepath6 %{buildroot}/bin ln -sf %{_bindir}/tracepath6 %{buildroot}/bin
#EndUsrMerge %endif
%find_lang %{name} %find_lang %{name}
@ -148,7 +148,7 @@ ln -sf %{_bindir}/tracepath6 %{buildroot}/bin
%{_bindir}/tracepath6 %{_bindir}/tracepath6
%{_unitdir}/rdisc.service %{_unitdir}/rdisc.service
#UsrMerge %if !0%{?usrmerged}
/bin/arping /bin/arping
/bin/clockdiff /bin/clockdiff
/bin/ping /bin/ping
@ -156,22 +156,21 @@ ln -sf %{_bindir}/tracepath6 %{buildroot}/bin
/sbin/rdisc /sbin/rdisc
/bin/tracepath /bin/tracepath
/bin/tracepath6 /bin/tracepath6
#EndUsrMerge %endif
%{_mandir}/man8/arping.8%{?ext_man} %{_mandir}/man8/arping.8%{?ext_man}
%{_mandir}/man8/clockdiff.8%{?ext_man} %{_mandir}/man8/clockdiff.8%{?ext_man}
%{_mandir}/man8/ping.8%{?ext_man} %{_mandir}/man8/ping.8%{?ext_man}
%{_mandir}/man8/rdisc.8%{?ext_man} %{_mandir}/man8/rdisc.8%{?ext_man}
%{_mandir}/man8/tracepath.8%{?ext_man} %{_mandir}/man8/tracepath.8%{?ext_man}
%{_mandir}/man8/tracepath6.8%{?ext_man} %{_mandir}/man8/tracepath6.8%{?ext_man}
#EndUsrMerge
%files -n rarpd %files -n rarpd
%{_sbindir}/rarpd %{_sbindir}/rarpd
%{_unitdir}/rarpd@.service %{_unitdir}/rarpd@.service
%{_sbindir}/rcrarpd %{_sbindir}/rcrarpd
#UsrMerge %if !0%{?usrmerged}
/sbin/rarpd /sbin/rarpd
#EndUsrMerge %endif
%{_mandir}/man8/rarpd.8%{?ext_man} %{_mandir}/man8/rarpd.8%{?ext_man}
%changelog %changelog