From 590da8e98415abfc353916e598745ffaf13ef088e4e044ba6bf287d33a9471c3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 21 Dec 2012 02:40:01 +0000 Subject: [PATCH] Factory has 3.7 now OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=68 --- xtables-addons.changes | 1 + xtables-addons.spec | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xtables-addons.changes b/xtables-addons.changes index 3baf167..4815f50 100644 --- a/xtables-addons.changes +++ b/xtables-addons.changes @@ -2,6 +2,7 @@ Fri Dec 21 02:08:44 UTC 2012 - jengelh@inai.de - Always ship all source tarballs to make osc validator happy +- Enable version 2.0 for openSUSE:Factory which now has kernel 3.7 ------------------------------------------------------------------- Mon Dec 3 15:17:18 CET 2012 - sbrabec@suse.cz diff --git a/xtables-addons.spec b/xtables-addons.spec index 81c0ad0..0ce82ca 100644 --- a/xtables-addons.spec +++ b/xtables-addons.spec @@ -17,7 +17,10 @@ Name: xtables-addons -%if "%_repository" == "Kernel_HEAD" +%if 0%{?suse_version} >= 1230 || "%_repository" == "Kernel_HEAD" +%define kernel37 1 +%endif +%if 0%{?kernel37} Version: 2.0 Release: 0 %else @@ -94,9 +97,8 @@ main kernel/iptables packages. %prep %{?gpg_verify: %gpg_verify %_sourcedir/%name-%version.tar.xz.asc} -echo "Version: %version" -echo "Repository: %_repository" -%if "%_repository" == "Kernel_HEAD" +echo "Version: %version. Repository: %_repository. SUSE_v: %{?suse_version}" +%if 0%{?kernel37} %setup -Tqb7 %else %setup -Tqb5