From 71ed84f0832e9218273cba0737a69f7d7eab637d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Tue, 14 Feb 2012 20:18:41 +0000
Subject: [PATCH] - rel 17 - drop our -dist hack

Changed files:
    ipset-config_dist.patch -> 1.3
    ipset.spec -> 1.145
---
 ipset-config_dist.patch | 11 -----------
 ipset.spec              | 13 ++++---------
 2 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 ipset-config_dist.patch

diff --git a/ipset-config_dist.patch b/ipset-config_dist.patch
deleted file mode 100644
index 89b5dcf..0000000
--- a/ipset-config_dist.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ipset-6.6/configure.ac~	2011-05-24 10:28:55.000000000 +0200
-+++ ipset-6.6/configure.ac	2011-05-26 14:03:37.703069144 +0200
-@@ -44,7 +44,7 @@
- 	AC_MSG_ERROR([Invalid kernel source directory $ksourcedir])
- fi
- 
--if test ! -e "$kbuilddir/.config"
-+if test ! -e "$kbuilddir/config-dist"
- then
- 	AC_MSG_ERROR([The kernel build directory $kbuilddir is not configured])
- fi
diff --git a/ipset.spec b/ipset.spec
index 2f2ab94..03ed28d 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,7 +20,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	16
+%define		rel	17
 %define		pname	ipset
 Summary:	IP sets utility
 Summary(pl.UTF-8):	Narzędzie do zarządzania zbiorami IP
@@ -33,9 +33,8 @@ Group:		Networking/Admin
 Source0:	http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
 # Source0-md5:	71f4b826e025be5918a52e9843673167
 Source1:	%{pname}.init
-Patch0:		%{pname}-config_dist.patch
-Patch1:		%{pname}-no_kernel.patch
-Patch2:		%{pname}-hash-net-if-fix.patch
+Patch0:		%{pname}-no_kernel.patch
+Patch1:		%{pname}-hash-net-if-fix.patch
 URL:		http://ipset.netfilter.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -134,12 +133,8 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla zbiorów IP.
 
 %prep
 %setup -q -n %{pname}-%{version}
-%if %{with kernel}
-%{?with_dist_kernel:%patch0 -p1}
-%else
+%{!?with_kernel:%patch0 -p1}
 %patch1 -p1
-%endif
-%patch2 -p1
 
 %build
 %{__libtoolize}
-- 
2.44.0