From 4d8f8c6d9c2b1b9a0928f5b1f067c3272042ff876a399c7c6c8dfc739b996c5a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 25 Nov 2014 09:15:38 +0000 Subject: [PATCH] General cleanups OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=88 --- iproute2-doc.changes | 4 ++-- iproute2.spec | 11 ++--------- revert-bison-fix.diff | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/iproute2-doc.changes b/iproute2-doc.changes index 11487b8..cdc67f1 100644 --- a/iproute2-doc.changes +++ b/iproute2-doc.changes @@ -3,8 +3,8 @@ Tue Nov 25 08:18:52 UTC 2014 - mkubecek@suse.cz - Update to new upstream release 3.17 * ip: allow to set ipv6 address generation mode -* nstat: 64bit support on 32bit architectures -* ip: don't require "name" keyword when adding device +* nstat: 64-bit support on 32-bit architectures +* ip: do not require "name" keyword when adding device (3.16 regression) * ip: support of usec rtt in tcp_metrics * ip: allow to change slave options via type_slave diff --git a/iproute2.spec b/iproute2.spec index fe77bc0..fa7d044 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -70,13 +70,7 @@ Provides: libnetlink = %version-%release libnetlink provides a higher level interface to rtnetlink(7). %prep -%{?gpg_verify: xz -dfk "%{S:0}"; %gpg_verify %{S:2}} -%if 0%{?__xz:1} %setup -qn %name-%rversion -%else -tar -xf "%{S:0}" --use=xz; -%setup -DTqn %name-%rversion -%endif %patch -P 1 -P 2 -p1 %if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220) %patch -P 3 -p1 @@ -131,9 +125,8 @@ cp -an README* COPYING "$b/%_docdir/%name/" %_mandir/man8/* %dir %_sysconfdir/iproute2 %config(noreplace) %_sysconfdir/iproute2/* -%_libdir/tc -%dir %_datadir/tc -%attr(644,root,root)%_datadir/tc/* +%_libdir/tc/ +%_datadir/tc/ %files -n libnetlink-devel %defattr(-,root,root) diff --git a/revert-bison-fix.diff b/revert-bison-fix.diff index b9d8cf9..d3e11bf 100644 --- a/revert-bison-fix.diff +++ b/revert-bison-fix.diff @@ -5,7 +5,7 @@ Subject: [PATCH] Revert "emp: fix warning on deprecated bison directive" This reverts commit edd3979272e46d17456a4dabc3e9acf59e561d5a. -SLE11 only, its bison doesn't allow new syntax. +For SLE11 only. Its bison [version 2.3] does not allow new syntax. --- tc/emp_ematch.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)