- up to 6.6

Changed files:
    ipset-config_dist.patch -> 1.2
    ipset.spec -> 1.121

diff --git a/ipset-config_dist.patch b/ipset-config_dist.patch
index 6865ae499f1fde254c81187c9568b95c10034138..89b5dcfd6a9866280ffd4852f7c03515213746d4 100644 (file)
--- a/ipset-config_dist.patch
+++ b/ipset-config_dist.patch
@@ -1,6 +1,6 @@
---- ipset-6.3/configure.ac.orig        2011-04-10 17:25:20.000000000 +0200
-+++ ipset-6.3/configure.ac     2011-04-15 12:14:24.000000000 +0200
-@@ -44,14 +44,14 @@
+--- 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
  
@@ -9,11 +9,3 @@
  then
        AC_MSG_ERROR([The kernel build directory $kbuilddir is not configured])
  fi
- 
- AC_PROG_GREP
- 
--if test "X`$GREP '^CONFIG_IP6_NF_IPTABLES=' $kbuilddir/.config`" = "X"
-+if test "X`$GREP '^CONFIG_IP6_NF_IPTABLES=' $kbuilddir/config-dist`" = "X"
- then
-       AC_MSG_ERROR([The kernel build directory $kbuilddir is not configured with IP6_NF_IPTABLES support (ip6tables)])
- fi

diff --git a/ipset.spec b/ipset.spec
index c73980bfc26e0d866283fca127545d435cc3b78a..bba43e510538ad76eafb149f22049296407709d2 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,18 +20,18 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     2
+%define                rel     1
 %define                pname   ipset
 Summary:       IP sets utility
 Summary(pl.UTF-8):     Narzędzie do zarządzania zbiorami IP
 Name:          %{pname}%{_alt_kernel}
-Version:       6.5
+Version:       6.6
 Release:       %{rel}
 License:       GPL v2
 Group:         Networking/Admin
 #Source0Download: http://ipset.netfilter.org/install.html
 Source0:       http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
-# Source0-md5: 9d334e3a6b696d461de6de27246fdec0
+# Source0-md5: 14eafc915f559b900ed2256b761af9d4
 Source1:       %{pname}.init
 Patch0:                %{pname}-config_dist.patch
 Patch1:                %{pname}-no_kernel.patch