X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=ipset.spec;h=7f310f2caa5e06d89ce7a7a4d73f3537657a1da5;hb=4fbe6bda1ad8bf7dc8f7f07a8ee1b23e8ce1bca5;hp=362b56f497944093c91ae83ac5e98ecfe411a126;hpb=7ae2f2bc8d14d59f8dd8e014d0a1d4f25e4418bd;p=packages%2Fipset.git

diff --git a/ipset.spec b/ipset.spec
index 362b56f..7f310f2 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -22,19 +22,20 @@ exit 1
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	1
+%define		rel	0.1
 %define		pname	ipset
 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.29
+Version:	7.1
 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:	fd8ea35997115c5c630eee22f0beecec
+# Source0-md5:	72b477d1ce076d681b0799f88280f2f3
 Source1:	%{pname}.init
+Patch0:		kernel-5.0.patch
 URL:		http://ipset.netfilter.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -44,7 +45,7 @@ BuildRequires:	libtool >= 2:2.0
 %{?with_userspace:BuildRequires:	linux-libc-headers >= 7:2.6.38.6}
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.701
-%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.24}}
 Suggests:	kernel-net-ipset
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -105,6 +106,19 @@ IPset initialization script.
 %description init -l pl.UTF-8
 Skrypt startowy IPset.
 
+%package -n bash-completion-ipset
+Summary:	Bash completion for ipset command
+Summary(pl.UTF-8):	Bashowe dopełnianie parametrów polecenia ipset
+Group:		Applications/Shells
+Requires:	%{pname} = %{version}-%{release}
+Requires:	bash-completion >= 2.0
+
+%description -n bash-completion-ipset
+Bash completion for ipset command.
+
+%description -n bash-completion-ipset -l pl.UTF-8
+Bashowe dopełnianie parametrów polecenia ipset.
+
 %define	kernel_pkg()\
 %package -n kernel%{_alt_kernel}-net-ipset\
 Summary:	IPset kernel modules\
@@ -172,15 +186,25 @@ done\
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %if %{with userspace}
-%configure \
+install -d build-usr
+cd build-usr
+../%configure \
+	bashcompdir=%{bash_compdir} \
+	--enable-bashcompl \
 	--disable-silent-rules \
 	--with-kmod=no \
 	--with-settype-modules-list=all
 
 %{__make}
+cd ..
 %endif
 
 %{?with_kernel:%{expand:%build_kernel_packages}}
@@ -191,9 +215,8 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_includedir}/libipset}
 
-%{__make} install \
+%{__make} -C build-usr install \
 	DESTDIR=$RPM_BUILD_ROOT
-cp include/libipset/*.h $RPM_BUILD_ROOT%{_includedir}/libipset
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{pname}
 %endif
@@ -220,7 +243,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.3
+%attr(755,root,root) %ghost %{_libdir}/libipset.so.13
+%{_mandir}/man3/libipset.3*
 %{_mandir}/man8/ipset.8*
 
 %files devel
@@ -237,4 +261,8 @@ fi
 %files init
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/ipset
+
+%files -n bash-completion-ipset
+%defattr(644,root,root,755)
+%{bash_compdir}/ipset
 %endif