From 50ddf594d1175e20bd321d5962a7acf7fa40df223c174c183b029d398ada298b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 28 Apr 2014 15:24:25 +0000 Subject: [PATCH] Put back 3.14. The zero is never helping. OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=80 --- iproute2-doc.spec | 10 ++++++---- iproute2.spec | 11 ++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/iproute2-doc.spec b/iproute2-doc.spec index 9c58784..4250c6a 100644 --- a/iproute2-doc.spec +++ b/iproute2-doc.spec @@ -17,15 +17,17 @@ Name: iproute2-doc -Version: 3.14.0 +Version: 3.14 Release: 0 +%define rversion 3.14.0 Summary: Documentation to iproute2 License: GPL-2.0+ Group: Documentation/Other Url: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 + +Source: http://kernel.org/pub/linux/utils/net/iproute2/iproute2-%rversion.tar.xz +Source2: http://kernel.org/pub/linux/utils/net/iproute2/iproute2-%rversion.tar.sign BuildArch: noarch -Source: http://kernel.org/pub/linux/utils/net/iproute2/iproute2-%version.tar.xz -Source2: http://kernel.org/pub/linux/utils/net/iproute2/iproute2-%version.tar.sign BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel @@ -49,7 +51,7 @@ This package contains the PDF documentation from iproute2, as well as examples and other outdated files. %prep -%setup -qn iproute2-%version +%setup -qn iproute2-%rversion %build # build with -fPIC. For details see diff --git a/iproute2.spec b/iproute2.spec index 51899c7..871d0db 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -17,8 +17,9 @@ Name: iproute2 -Version: 3.14.0 +Version: 3.14 Release: 0 +%define rversion 3.14.0 Summary: Linux network configuration utilities License: GPL-2.0 Group: Productivity/Networking/Routing @@ -27,8 +28,8 @@ Url: http://www.linuxfoundation.org/collaborate/workgroups/networking #DL-URL: http://kernel.org/pub/linux/utils/net/iproute2/ #Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2 -Source: http://kernel.org/pub/linux/utils/net/iproute2/%name-%version.tar.xz -Source2: http://kernel.org/pub/linux/utils/net/iproute2/%name-%version.tar.sign +Source: http://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.xz +Source2: http://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.sign Source666: pre_checkin.sh Source667: %name.keyring Patch1: iproute2-dirs.diff @@ -70,10 +71,10 @@ 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-%version +%setup -qn %name-%rversion %else tar -xf "%{S:0}" --use=xz; -%setup -DTqn %name-%version +%setup -DTqn %name-%rversion %endif %patch -P 1 -P 2 -p1 %if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220)