From: Adam Gołębiowski <adamg@pld-linux.org>
Date: Tue, 6 Nov 2018 20:55:09 +0000 (+0100)
Subject: - updated to 7.0, new soname
X-Git-Tag: auto/th/ipset-7.0-1~1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fipset.git;a=commitdiff_plain;h=21871c33854fda62c314cb860f9a304191bfb802

- updated to 7.0, new soname
---

diff --git a/ipset.spec b/ipset.spec
index 2fbced3..4eff64b 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -27,15 +27,14 @@ exit 1
 Summary:	IP sets utility
 Summary(pl.UTF-8):	Narzędzie do zarządzania zbiorami IP
 Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:	6.38
+Version:	7.0
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:	GPL v2
 Group:		Networking/Admin
 #Source0Download: http://ipset.netfilter.org/install.html
 Source0:	http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
-# Source0-md5:	0e5d9c85f6b78e7dff0c996e2900574b
+# Source0-md5:	64c4e2e7123481c9db7ee1df127d9531
 Source1:	%{pname}.init
-Patch0:		kernel-4.17.patch
 URL:		http://ipset.netfilter.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -186,7 +185,6 @@ done\
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
 
 %build
 %{__aclocal}
@@ -243,7 +241,8 @@ fi
 %doc ChangeLog ChangeLog.ippool README UPGRADE
 %attr(755,root,root) %{_sbindir}/ipset
 %attr(755,root,root) %{_libdir}/libipset.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libipset.so.11
+%attr(755,root,root) %ghost %{_libdir}/libipset.so.13
+%{_mandir}/man3/libipset.3*
 %{_mandir}/man8/ipset.8*
 
 %files devel
diff --git a/kernel-4.17.patch b/kernel-4.17.patch
deleted file mode 100644
index 0137012..0000000
--- a/kernel-4.17.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ipset-6.38/configure.ac~	2018-04-10 23:36:27.000000000 +0200
-+++ ipset-6.38/configure.ac	2018-06-18 20:33:55.197510866 +0200
-@@ -345,7 +345,7 @@
- 
- AC_MSG_CHECKING([kernel source for id in struct pernet_operations])
- if test -f $ksourcedir/include/net/net_namespace.h && \
--   $AWK '/struct pernet_operations/ {for(i=1; i<=6; i++) {getline; print}}' $ksourcedir/include/net/net_namespace.h | $GREP -q 'int \*id;'; then
-+   $AWK '/struct pernet_operations/ {for(i=1; i<=26; i++) {getline; print}}' $ksourcedir/include/net/net_namespace.h | $GREP -q 'int \*id;'; then
- 	AC_MSG_RESULT(yes)
- 	AC_SUBST(HAVE_NET_OPS_ID, define)
- else