Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/iputils.git#e6a249bc9dc0420e851f02926b542ac32173dab4
This commit is contained in:
DistroBaker 2021-02-04 05:50:16 +01:00
parent 1dc7016609
commit efb13a3c0b

View File

@ -3,13 +3,13 @@
Summary: Network monitoring tools including ping Summary: Network monitoring tools including ping
Name: iputils Name: iputils
Version: 20200821 Version: 20200821
Release: 1%{?dist} Release: 2%{?dist}
# some parts are under the original BSD (ping.c) # some parts are under the original BSD (ping.c)
# some are under GPLv2+ (tracepath.c) # some are under GPLv2+ (tracepath.c)
License: BSD and GPLv2+ License: BSD and GPLv2+
URL: https://github.com/iputils/iputils URL: https://github.com/iputils/iputils
Source0: https://github.com/iputils/iputils/archive/s%{version}.tar.gz#/%{name}-s%{version}.tar.gz Source0: https://github.com/iputils/iputils/archive/s%{version}/%{name}-s%{version}.tar.gz
Source1: ifenslave.tar.gz Source1: ifenslave.tar.gz
Source2: rdisc.service Source2: rdisc.service
Source3: ninfod.service Source3: ninfod.service
@ -65,7 +65,7 @@ export LDFLAGS="-pie -Wl,-z,relro,-z,now"
%meson -DBUILD_TFTPD=false %meson -DBUILD_TFTPD=false
%meson_build %meson_build
gcc -Wall $RPM_OPT_FLAGS $CFLAGS $LDFLAGS ifenslave.c -o ifenslave gcc -Wall $RPM_OPT_FLAGS $CFLAGS $RPM_LD_FLAGS $LDFLAGS ifenslave.c -o ifenslave
%install %install
%meson_install %meson_install
@ -102,7 +102,6 @@ install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
%files -f %{name}.lang %files -f %{name}.lang
%doc README.bonding %doc README.bonding
%{!?_licensedir:%global license %%doc}
%license bsd.txt gpl-2.0.txt %license bsd.txt gpl-2.0.txt
%{_unitdir}/rdisc.service %{_unitdir}/rdisc.service
%attr(0755,root,root) %caps(cap_net_raw=p) %{_bindir}/clockdiff %attr(0755,root,root) %caps(cap_net_raw=p) %{_bindir}/clockdiff
@ -131,6 +130,9 @@ install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
%attr(644,root,root) %{_mandir}/man8/ninfod.8.gz %attr(644,root,root) %{_mandir}/man8/ninfod.8.gz
%changelog %changelog
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200821-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Oct 31 2020 Kevin Fenzi <kevin@scrye.com> - 20200821-1 * Sat Oct 31 2020 Kevin Fenzi <kevin@scrye.com> - 20200821-1
- Update to 20200821 release. Fixes bug #1871310 - Update to 20200821 release. Fixes bug #1871310