Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package net-tools for openSUSE:Factory
checked in at 2021-01-18 11:26:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/net-tools (Old)
and /work/SRC/openSUSE:Factory/.net-tools.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "net-tools"
Mon Jan 18 11:26:21 2021 rev:56 rq:862849 version:2.0+git20180626.aebd88e
Changes:
--------
--- /work/SRC/openSUSE:Factory/net-tools/net-tools.changes 2019-10-10
11:48:52.540048919 +0200
+++ /work/SRC/openSUSE:Factory/.net-tools.new.28504/net-tools.changes
2021-01-18 11:26:38.624456393 +0100
@@ -1,0 +2,5 @@
+Mon Oct 19 16:15:27 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ net-tools.spec ++++++
--- /var/tmp/diff_new_pack.dQaTXV/_old 2021-01-18 11:26:39.384458105 +0100
+++ /var/tmp/diff_new_pack.dQaTXV/_new 2021-01-18 11:26:39.384458105 +0100
@@ -1,7 +1,7 @@
#
# spec file for package net-tools
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -87,6 +87,7 @@
help2man -s8 "%{buildroot}%{_sbindir}/${tool}" --no-discard-stderr >"${t}"
done
# generate bin/sbin compat symlinks
+%if !0%{?usrmerged}
mkdir -p %{buildroot}/sbin
mkdir -p %{buildroot}/bin
for i in ether-wake nameif plipconfig slattach arp ipmaddr iptunnel; do
@@ -95,19 +96,22 @@
for i in netstat ifconfig route; do
ln -s %{_bindir}/$i %{buildroot}/bin/$i
done
+%endif
%find_lang %{name} --all-name
%files
%license COPYING
%doc README ABOUT-NLS
%{_sbindir}/ether-wake
-/sbin/ether-wake
%{_sbindir}/nameif
-/sbin/nameif
%{_sbindir}/plipconfig
-/sbin/plipconfig
%{_sbindir}/slattach
+%if !0%{?usrmerged}
+/sbin/ether-wake
+/sbin/nameif
+/sbin/plipconfig
/sbin/slattach
+%endif
%{_mandir}/de/man5/ethers.5%{?ext_man}
%{_mandir}/de/man8/plipconfig.8%{?ext_man}
%{_mandir}/de/man8/slattach.8%{?ext_man}
@@ -122,18 +126,20 @@
%files deprecated
%license COPYING
+%{_bindir}/ifconfig
%{_bindir}/netstat
+%{_bindir}/route
+%if !0%{?usrmerged}
+/bin/ifconfig
/bin/netstat
-%{_sbindir}/arp
+/bin/route
/sbin/arp
-%{_bindir}/ifconfig
-/bin/ifconfig
-%{_sbindir}/ipmaddr
/sbin/ipmaddr
-%{_sbindir}/iptunnel
/sbin/iptunnel
-%{_bindir}/route
-/bin/route
+%endif
+%{_sbindir}/arp
+%{_sbindir}/ipmaddr
+%{_sbindir}/iptunnel
%{_mandir}/de/man8/arp.8%{?ext_man}
%{_mandir}/de/man8/ifconfig.8%{?ext_man}
%{_mandir}/de/man8/netstat.8%{?ext_man}
