- up to 6.34

[packages/ipset.git] / ipset.spec

diff --git a/ipset.spec b/ipset.spec
index 207aee7ad00e5a1d857fd1e9d8fe628684ae2b8c..a4f9592db007a883bd74d586b5aa3d48473bc299 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -22,20 +22,19 @@ exit 1
 %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.24
+Version:       6.34
 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: 8831b8f01458bf2abacc222884195a62
+# Source0-md5: 51bd03f976a1501fd45e1d71a1e2e6bf
 Source1:       %{pname}.init
-Patch0:                list_last_entry.patch
 URL:           http://ipset.netfilter.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -106,6 +105,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\
@@ -173,16 +185,24 @@ 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}}
@@ -193,9 +213,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
@@ -239,4 +258,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