From f0557f39740b5c18f07b2caf634eb073ba19484f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0imerda?= Date: Mon, 11 May 2015 18:33:58 +0200 Subject: [PATCH] Remove patch rejected by upstream --- iproute.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/iproute.spec b/iproute.spec index bb272c7..fcf86a5 100644 --- a/iproute.spec +++ b/iproute.spec @@ -2,7 +2,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 4.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/System 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 @@ -11,6 +11,9 @@ Source2: avpkt # manpage/help improvements # +# * Posted upstream. +# * TODO: Repost in chunks. +# # https://bugzilla.redhat.com/show_bug.cgi?id=1072441 # https://bugzilla.redhat.com/show_bug.cgi?id=1075692 # https://bugzilla.redhat.com/show_bug.cgi?id=1077191 @@ -24,36 +27,35 @@ Patch1: iproute2-3.19.0-docs.patch # # (no bugzilla tickets) # http://www.spinics.net/lists/netdev/msg325109.html +# https://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=06ec9039c3aa07924f9c23b0daa8885204704a62 Patch2: iproute2-3.19.0-build.patch # ip-xfrm: support 'proto any' with 'sport' and 'dport' # # https://bugzilla.redhat.com/show_bug.cgi?id=497355 # http://www.spinics.net/lists/netdev/msg325111.html +# https://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=11a3e5c4b31530840d6ea4339ce4078d5922b5d6 Patch3: iproute2-3.19.0-proto-any.patch # cbq: fix find syntax in example # # https://bugzilla.redhat.com/show_bug.cgi?id=539232 # http://www.spinics.net/lists/netdev/msg325112.html +# https://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=a51842dcd77200159e091da8b2e38e428652532d Patch4: iproute2-3.19.0-cbq-example.patch -# ip-route: don't hide routes with RTM_F_CLONED by default -# -# (no bugzilla ticket) -# http://www.spinics.net/lists/netdev/msg325115.html -Patch5: iproute2-3.19.0-route-cloned.patch - # lnstat: dump to stdout, not stderr # # (no bugzilla ticket) # http://www.spinics.net/lists/netdev/msg325113.html +# https://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=b1410e0ab1b4f2f9f0b21392efc213692adf2bd5 Patch6: iproute2-3.19.0-lnstat-stdout.patch # lnstat: run indefinitely by default # # https://bugzilla.redhat.com/show_bug.cgi?id=977845 # http://www.spinics.net/lists/netdev/msg325110.html +# https://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=e7e2913fe44780edf6a7c45123577a522f7adbb4 Patch7: iproute2-3.19.0-lnstat-interval.patch # tc: add -OK option @@ -112,7 +114,6 @@ The libnetlink static library. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 @@ -220,6 +221,9 @@ done %{_includedir}/libnetlink.h %changelog +* Mon May 11 2015 Pavel Šimerda - 4.0.0-2 +- Remove patch rejected by upstream + * Tue Apr 14 2015 Pavel Šimerda - 4.0.0-1 - new version 4.0.0