%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}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version: 6.21.1
+Version: 7.3
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: 9c136fd51694eb0ef259cda085145da0
+# Source0-md5: a041d186097a23f1f87208f11144907e
Source1: %{pname}.init
+Patch0: kernel-5.0.patch
+Patch1: kernel-5.1.patch
URL: http://ipset.netfilter.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
%{?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)
%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\
%prep
%setup -q -n %{pname}-%{version}
+%patch0 -p1
+%patch1 -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}}
%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
%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
%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