# the dependencies here
#
# Conditional build:
-%bcond_without dist_kernel # allow non-distribution kernel
%bcond_without kernel # don't build kernel modules
%bcond_without userspace # don't build userspace tools
%bcond_with verbose # verbose build (V=1)
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-
# The goal here is to have main, userspace, package built once with
# simple release number, and only rebuild kernel packages with kernel
# version as part of release number, without the need to bump release
exit 1
%endif
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine with_userspace
-%global _build_kernels %{alt_kernel}
-%else
-%global _build_kernels %{?build_kernels:,%{?build_kernels}}
-%endif
-
%if %{without userspace}
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
%endif
-%define kpkg %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
-%define bkpkg %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
%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.20.1
-Release: %{rel}%{?with_kernel:@%{_kernel_ver_str}}
+Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
+Version: 7.14
+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: 8af741492752fbf24d3a28a9d1473d40
+# Source0-md5: a624b3de000a14b9fd2518a9a806ef1c
Source1: %{pname}.init
URL: http://ipset.netfilter.org/
-BuildRequires: autoconf >= 2.50
+BuildRequires: autoconf >= 2.63
BuildRequires: automake
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.38.6}
-BuildRequires: libmnl-devel >= 1
BuildRequires: libltdl-devel >= 2:2.0
+BuildRequires: libmnl-devel >= 1
BuildRequires: libtool >= 2:2.0
%{?with_userspace:BuildRequires: linux-libc-headers >= 7:2.6.38.6}
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.678
+BuildRequires: rpmbuild(macros) >= 1.701
+%{?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 -l pl.UTF-8
Zbiory IP to szkielet w jądrze Linuksa 2.4.x i 2.6.x, którym można
-administrować przy użyciu narzędzia ipset. W zależności od
-rodzaju aktualnie zbiór IP może przechowywać adresy IP, numery
-portów (TCP/UDP) lub adresy IP z adresami MAC - w sposób
-zapewniający maksymalną szybkość przy dopasowywaniu elementu do
-zbioru.
+administrować przy użyciu narzędzia ipset. W zależności od rodzaju
+aktualnie zbiór IP może przechowywać adresy IP, numery portów
+(TCP/UDP) lub adresy IP z adresami MAC - w sposób zapewniający
+maksymalną szybkość przy dopasowywaniu elementu do zbioru.
%package devel
Summary: Header files for ipset interface
%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\
Summary(pl.UTF-8): Moduły jądra oferujące wsparcie dla zbiorów IP\
Release: %{rel}@%{_kernel_ver_str}\
Group: Base/Kernel\
-%{?with_dist_kernel:%requires_releq_kernel}\
Requires(post,postun): /sbin/depmod\
+%requires_releq_kernel\
+Requires(postun): %releq_kernel\
\
%description -n kernel%{_alt_kernel}-net-ipset\
IP sets are a framework inside the Linux 2.4.x and 2.6.x kernel, which\
done\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{pname}-%{version}
%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:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
%install
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
%defattr(644,root,root,755)
%doc ChangeLog ChangeLog.ippool README UPGRADE
%attr(755,root,root) %{_sbindir}/ipset
+%attr(755,root,root) %{_sbindir}/ipset-translate
%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}/man8/ipset.8*
+%{_mandir}/man8/ipset-translate.8*
+
%files devel
%defattr(644,root,root,755)
%{_libdir}/libipset.la
%{_includedir}/libipset
%{_pkgconfigdir}/libipset.pc
+%{_mandir}/man3/libipset.3*
%files static
%defattr(644,root,root,755)
%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