diff --git a/.gitignore b/.gitignore index 0c51ebd..2683773 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /iproute2-6.7.0.tar.xz /iproute2-6.11.0.tar.xz /iproute2-6.14.0.tar.xz +/iproute2-6.17.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 6805535..77088b9 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,10 +1,12 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.14.0 +Version: 6.17.0 Release: %autorelease URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz +%if 0%{?rhel} Source1: rt_dsfield.deprecated +%endif Source2: README.etc License: GPL-2.0-or-later AND NIST-PD @@ -91,23 +93,25 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a # drop these files, iproute-doc package extracts files directly from _builddir rm -rf '%{buildroot}%{_docdir}' +mkdir -p %{buildroot}%{_sysconfdir}/iproute2 +cp %{SOURCE2} %{buildroot}%{_sysconfdir}/iproute2/README + # append deprecated values to rt_dsfield for compatibility reasons %if 0%{?rhel} cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield -mkdir -p %{buildroot}%{_sysconfdir}/iproute2 -cp %{SOURCE2} %{buildroot}%{_sysconfdir}/iproute2/README cp %{SOURCE2} %{buildroot}%{_datadir}/iproute2/README -%endif # RHEL-94662: restore /etc/iproute2 conf files, if modified # this is safe because we don't have conf files in /etc/iproute2 anymore, so # every *.rpmsave file over there is a leftover from a failed conf upgrade + %posttrans if [ -f /etc/iproute2/*rpmsave ]; then for conffile in /etc/iproute2/*rpmsave; do mv $conffile ${conffile%.rpmsave} done fi +%endif %files %dir %{_sysconfdir}/iproute2 diff --git a/sources b/sources index 55dc7d0..0d51e03 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (iproute2-6.7.0.tar.xz) = 5d8dca139b1b980dac6c841f477b951dd199074cb078b5ea8df23b3532eeb235cca1df9f6628b0f81b7edd62aaf4e95bad15a851843bd61e5715215da97cc546 SHA512 (iproute2-6.11.0.tar.xz) = 06bedd7ae573fe5cf9c72af698987ba03e53dc6fce5f41813bf5bb155b683490e5c75cc835ce5ba4509e491eb6138e96da162204c28ea1b3d80887107997a3b3 SHA512 (iproute2-6.14.0.tar.xz) = e79049bdca0e0381f0a93a40e4d597ce59fb509dabc6e8b04a510ff9953f091c67577d6faa62967bd197bf62ab6e56d928558270a1390621431acb237b77fa46 +SHA512 (iproute2-6.17.0.tar.xz) = 3d83d49233c1d984f15d285a46e2ec0eeb820c7cb84cfc84866921f37e8a57d31bc3953be07e8c79ed6079f326a25c3a85f591b0d67f9f689c0c70ccdb0fef77