packages: ipset/ipset.spec, ipset/ipset-config_dist.patch (REMOVED)=?UTF-8?Q?=20?=- rel 1...

[baggins]

Author: baggins                      Date: Tue Feb 14 20:18:46 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 17
- drop our -dist hack

---- Files affected:
packages/ipset:
   ipset.spec (1.144 -> 1.145) , ipset-config_dist.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/ipset/ipset.spec
diff -u packages/ipset/ipset.spec:1.144 packages/ipset/ipset.spec:1.145
--- packages/ipset/ipset.spec:1.144	Tue Feb 14 20:24:55 2012
+++ packages/ipset/ipset.spec	Tue Feb 14 21:18:41 2012
@@ -21,7 +21,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
@@ -34,9 +34,8 @@
 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
@@ -135,12 +134,8 @@
 
 %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}
@@ -237,6 +232,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.145  2012/02/14 20:18:41  baggins
+- rel 17
+- drop our -dist hack
+
 Revision 1.144  2012/02/14 19:24:55  arekm
 - release 16
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipset/ipset.spec?r1=1.144&r2=1.145&f=u