Jan Engelhardt 2014-01-09 13:52:34 +00:00 committed by Git OBS Bridge
parent 377611cf99
commit 4ff8a07cf3
3 changed files with 1 additions and 37 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06535dbefaa7725870750048842b4b53f5a4f8d8b16d5ce61bb4cc28e0b99326
size 323312

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iF4EABEIAAYFAlB8ZD8ACgkQkb3j62iiDkUqkgD/e5Ui9G4PXF0nNsD515d1S9Fv
esK5kmFgmI/hu2EJQsgBAKkRnenUyxSVOUUhU6xS0p2x0GwSQIKkkQ+AM5dQS13M
=9dLT
-----END PGP SIGNATURE-----

View File

@ -17,16 +17,8 @@
Name: xtables-addons Name: xtables-addons
%if 0%{?suse_version} >= 1230 || "%_repository" == "Kernel_HEAD"
%define kernel37 1
%endif
%if 0%{?kernel37}
Version: 2.4 Version: 2.4
Release: 0 Release: 0
%else
Version: 1.47.1
Release: 0
%endif
Summary: IP Packet Filter Administration Extensions Summary: IP Packet Filter Administration Extensions
License: GPL-2.0 and GPL-2.0+ License: GPL-2.0 and GPL-2.0+
Group: Productivity/Networking/Security Group: Productivity/Networking/Security
@ -37,8 +29,6 @@ Url: http://xtables-addons.sf.net/
#Git-Web: http://xtables-addons.git.sf.net/ #Git-Web: http://xtables-addons.git.sf.net/
Source3: %name-preamble Source3: %name-preamble
Source4: %name.keyring Source4: %name.keyring
Source5: %name-1.47.1.tar.xz
Source6: %name-1.47.1.tar.xz.asc
Source7: %name-2.4.tar.xz Source7: %name-2.4.tar.xz
Source8: %name-2.4.tar.asc Source8: %name-2.4.tar.asc
@ -46,24 +36,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} >= 1230 %if 0%{?suse_version} >= 1230
BuildRequires: gpg-offline BuildRequires: gpg-offline
%endif %endif
BuildRequires: %kernel_module_package_buildreqs
BuildRequires: pkgconfig >= 0.21 BuildRequires: pkgconfig >= 0.21
BuildRequires: xz BuildRequires: xz
%if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
BuildRequires: pkgconfig(xtables) >= 1.4.5 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: %name-kmp
Recommends: xtables-geoip Recommends: xtables-geoip
%else
Requires: xtables-geoip
%endif
%define xtlibdir %(pkg-config xtables --variable=xtlibdir) %define xtlibdir %(pkg-config xtables --variable=xtlibdir)
@ -92,11 +70,7 @@ main kernel/iptables packages.
%prep %prep
xz -dk "%_sourcedir/%name-%version.tar.xz" xz -dk "%_sourcedir/%name-%version.tar.xz"
%{?gpg_verify: %gpg_verify %_sourcedir/%name-%version.tar.asc} %{?gpg_verify: %gpg_verify %_sourcedir/%name-%version.tar.asc}
%if 0%{?kernel37}
%setup -Tqb7 %setup -Tqb7
%else
%setup -Tqb5
%endif
%build %build
pushd ../; pushd ../;