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/iproute.git#32597caac48b7382bfa1b5bf95e37f870829e9ad
This commit is contained in:
DistroBaker 2020-12-04 13:52:10 +00:00
parent d9a596f138
commit e5f2ac2e47
3 changed files with 11 additions and 14 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@
/iproute2-5.5.0.tar.xz /iproute2-5.5.0.tar.xz
/iproute2-5.7.0.tar.xz /iproute2-5.7.0.tar.xz
/iproute2-5.8.0.tar.xz /iproute2-5.8.0.tar.xz
/iproute2-5.9.0.tar.xz

View File

@ -1,7 +1,7 @@
%global cbq_version v0.7.3 %global cbq_version v0.7.3
Summary: Advanced IP routing and network device configuration tools Summary: Advanced IP routing and network device configuration tools
Name: iproute Name: iproute
Version: 5.8.0 Version: 5.9.0
Release: 1%{?dist} Release: 1%{?dist}
URL: http://kernel.org/pub/linux/utils/net/%{name}2/ URL: http://kernel.org/pub/linux/utils/net/%{name}2/
Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz
@ -23,6 +23,7 @@ BuildRequires: linux-atm-libs-devel
%endif %endif
%endif %endif
Provides: /sbin/ip Provides: /sbin/ip
Provides: iproute-doc = %{version}-%{release}
Recommends: %{name}-tc Recommends: %{name}-tc
Requires: psmisc Requires: psmisc
Obsoletes: iproute-doc < %{version}-%{release} Obsoletes: iproute-doc < %{version}-%{release}
@ -36,7 +37,7 @@ kernel.
Summary: Linux Traffic Control utility Summary: Linux Traffic Control utility
License: GPLv2+ License: GPLv2+
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Provides: tc Provides: /sbin/tc
%description tc %description tc
The Traffic Control utility manages queueing disciplines, their classes and The Traffic Control utility manages queueing disciplines, their classes and
@ -55,21 +56,13 @@ The libnetlink static library.
%autosetup -p1 -n %{name}2-%{version} %autosetup -p1 -n %{name}2-%{version}
%build %build
export CFLAGS='%{optflags}' %configure
export LDFLAGS='%{build_ldflags}' %make_build
export LIBDIR='%{_libdir}'
export IPT_LIB_DIR='/%{_lib}/xtables'
./configure
make %{?_smp_mflags}
%install %install
export DESTDIR='%{buildroot}'
export SBINDIR='%{_sbindir}' export SBINDIR='%{_sbindir}'
export MANDIR='%{_mandir}'
export LIBDIR='%{_libdir}' export LIBDIR='%{_libdir}'
export CONFDIR='%{_sysconfdir}/iproute2' %make_install
export DOCDIR='%{_docdir}'
make install
# libnetlink # libnetlink
install -D -m644 include/libnetlink.h %{buildroot}%{_includedir}/libnetlink.h install -D -m644 include/libnetlink.h %{buildroot}%{_includedir}/libnetlink.h
@ -108,6 +101,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
%{_includedir}/iproute2/bpf_elf.h %{_includedir}/iproute2/bpf_elf.h
%changelog %changelog
* Wed Dec 2 2020 Andrea Claudi <aclaudi@redhat.com> - 5.9.0-1
- New version 5.9.0
* Mon Aug 10 2020 Phil Sutter <psutter@redhat.com> - 5.8.0-1 * Mon Aug 10 2020 Phil Sutter <psutter@redhat.com> - 5.8.0-1
- New version 5.8.0 - New version 5.8.0

View File

@ -1 +1 @@
SHA512 (iproute2-5.8.0.tar.xz) = f2a3f7dcf5cb39ca7cd14f0e40e45641eccf4b93427c527a09fd789ac8621c5c3359769ca61fcc8bab7e915edd943c39b7c3e15cbfc497187aa6271eed0a9152 SHA512 (iproute2-5.9.0.tar.xz) = bce59b0e8d876f10f94926be7f2a7cda0de15db04fabedfe938649d486ca6d6d222523d1661b8b36ea50e35369a4730938d6ebeb80577ac0522a3432037bcd50