From 4ff8a07cf386785e7a4b5931b077256f4f6dd2472e298a5df2f4cfd1046aee16 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 9 Jan 2014 13:52:34 +0000 Subject: [PATCH] Strip 1.47 source OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=83 --- xtables-addons-1.47.1.tar.xz | 3 --- xtables-addons-1.47.1.tar.xz.asc | 7 ------- xtables-addons.spec | 28 +--------------------------- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 xtables-addons-1.47.1.tar.xz delete mode 100644 xtables-addons-1.47.1.tar.xz.asc diff --git a/xtables-addons-1.47.1.tar.xz b/xtables-addons-1.47.1.tar.xz deleted file mode 100644 index 5afc73b..0000000 --- a/xtables-addons-1.47.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06535dbefaa7725870750048842b4b53f5a4f8d8b16d5ce61bb4cc28e0b99326 -size 323312 diff --git a/xtables-addons-1.47.1.tar.xz.asc b/xtables-addons-1.47.1.tar.xz.asc deleted file mode 100644 index a56ca08..0000000 --- a/xtables-addons-1.47.1.tar.xz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iF4EABEIAAYFAlB8ZD8ACgkQkb3j62iiDkUqkgD/e5Ui9G4PXF0nNsD515d1S9Fv -esK5kmFgmI/hu2EJQsgBAKkRnenUyxSVOUUhU6xS0p2x0GwSQIKkkQ+AM5dQS13M -=9dLT ------END PGP SIGNATURE----- diff --git a/xtables-addons.spec b/xtables-addons.spec index 531a6bc..1c73abc 100644 --- a/xtables-addons.spec +++ b/xtables-addons.spec @@ -17,16 +17,8 @@ Name: xtables-addons -%if 0%{?suse_version} >= 1230 || "%_repository" == "Kernel_HEAD" -%define kernel37 1 -%endif -%if 0%{?kernel37} Version: 2.4 Release: 0 -%else -Version: 1.47.1 -Release: 0 -%endif Summary: IP Packet Filter Administration Extensions License: GPL-2.0 and GPL-2.0+ Group: Productivity/Networking/Security @@ -37,8 +29,6 @@ Url: http://xtables-addons.sf.net/ #Git-Web: http://xtables-addons.git.sf.net/ Source3: %name-preamble Source4: %name.keyring -Source5: %name-1.47.1.tar.xz -Source6: %name-1.47.1.tar.xz.asc Source7: %name-2.4.tar.xz Source8: %name-2.4.tar.asc @@ -46,24 +36,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1230 BuildRequires: gpg-offline %endif +BuildRequires: %kernel_module_package_buildreqs BuildRequires: pkgconfig >= 0.21 BuildRequires: xz -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(xtables) >= 1.4.5 -%endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -BuildRequires: libxtables-devel >= 1.4.5 -%endif -%if 0%{?redhat_version} || 0%{?centos_version} -BuildRequires: libxtables-devel >= 1.4.5 -%endif -%if 0%{?suse_version} -BuildRequires: %kernel_module_package_buildreqs Recommends: %name-kmp Recommends: xtables-geoip -%else -Requires: xtables-geoip -%endif %define xtlibdir %(pkg-config xtables --variable=xtlibdir) @@ -92,11 +70,7 @@ main kernel/iptables packages. %prep xz -dk "%_sourcedir/%name-%version.tar.xz" %{?gpg_verify: %gpg_verify %_sourcedir/%name-%version.tar.asc} -%if 0%{?kernel37} %setup -Tqb7 -%else -%setup -Tqb5 -%endif %build pushd ../;