From dfb0562930d5a980215b8e6c21eb407416e5660d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
Date: Thu, 12 Jun 2014 13:30:21 +0200
Subject: [PATCH] 3.15.0 bump

---
 .gitignore                                               | 1 +
 iproute.spec                                             | 9 ++++++---
 ...11.0-optflags.patch => iproute2-3.15.0-optflags.patch | 4 ++--
 sources                                                  | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)
 rename iproute2-3.11.0-optflags.patch => iproute2-3.15.0-optflags.patch (78%)

diff --git a/.gitignore b/.gitignore
index 0f518d7..38dda4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ iproute2-2.6.35.tar.bz2
 /iproute2-3.11.0.tar.gz
 /iproute2-3.12.0.tar.gz
 /iproute2-3.14.0.tar.gz
+/iproute2-3.15.0.tar.gz
diff --git a/iproute.spec b/iproute.spec
index 440e25f..a4b6e86 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,8 +1,8 @@
 %global             cbq_version v0.7.3
 Summary:            Advanced IP routing and network device configuration tools
 Name:               iproute
-Version:            3.14.0
-Release:            3%{?dist}
+Version:            3.15.0
+Release:            1%{?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.gz
@@ -10,7 +10,7 @@ Source1:            cbq-0000.example
 Source2:            avpkt
 Patch0:             man-pages.patch
 Patch1:             iproute2-3.4.0-kernel.patch
-Patch2:             iproute2-3.11.0-optflags.patch
+Patch2:             iproute2-3.15.0-optflags.patch
 Patch3:             iproute2-3.9.0-IPPROTO_IP_for_SA.patch
 Patch4:             iproute2-example-cbq-service.patch
 Patch5:             iproute2-2.6.35-print-route.patch
@@ -171,6 +171,9 @@ done
 %{_includedir}/libnetlink.h
 
 %changelog
+* Thu Jun 12 2014 Petr Šabata <contyk@redhat.com> - 3.15.0-1
+- 3.15.0 bump
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.14.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/iproute2-3.11.0-optflags.patch b/iproute2-3.15.0-optflags.patch
similarity index 78%
rename from iproute2-3.11.0-optflags.patch
rename to iproute2-3.15.0-optflags.patch
index b5396b5..025f60a 100644
--- a/iproute2-3.11.0-optflags.patch
+++ b/iproute2-3.15.0-optflags.patch
@@ -1,10 +1,10 @@
 diff --git a/Makefile b/Makefile
-index 95266f5..1876ec4 100644
+index c881200..e8eeeb7 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -34,7 +34,7 @@ CCOPTS = -O2
  WFLAGS := -Wall -Wstrict-prototypes  -Wmissing-prototypes
- WFLAGS += -Wmissing-declarations -Wold-style-definition
+ WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2
  
 -CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
 +CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(RPM_OPT_FLAGS)
diff --git a/sources b/sources
index ed92122..4f6930f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a5cf56a420c8a393072e3fd6d590079  iproute2-3.14.0.tar.gz
+2369e98a06ef3d5ba7fc625d19f87b1c  iproute2-3.15.0.tar.gz