Merge branch 'master' of ssh://git.pld-linux.org/packages/vzctl

[packages/vzctl.git] / vzctl.spec

diff --git a/vzctl.spec b/vzctl.spec
index 5caad510fa2f1f6a51ad3405b7499ab95d56dd45..7767a53099afa27c16d25a46b98adf098e97b668 100644 (file)
--- a/vzctl.spec
+++ b/vzctl.spec
@@ -1,12 +1,12 @@
 Summary:       OpenVZ containers control utility
 Summary(pl.UTF-8):     Narzędzie do zarządzania środowiskiem wirtualnym OpenVZ
 Name:          vzctl
-Version:       3.0.25.1
+Version:       4.0
 Release:       1
-License:       GPL
-Group:         Base/Kernel
+License:       GPL v2+
+Group:         Applications/System
 Source0:       http://download.openvz.org/utils/vzctl/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 5798ea88d06afff1d6d1bbbfc45899f1
+# Source0-md5: 8ac3959de47af8984b586f522203fd77
 Source1:       pld.conf
 Source2:       pld-add_ip.sh
 Source3:       pld-del_ip.sh
@@ -15,8 +15,12 @@ Source5:     vz-pld.in
 Source6:       vzeventd-pld.in
 Patch0:                %{name}-pld.patch
 URL:           http://openvz.org/
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake >= 1:1.9
+BuildRequires: libtool
+BuildRequires: libxml2-devel >= 1:2.6.16
+BuildRequires:         ploop-devel > 1.4
+Requires:      ploop-libs > 1.4
 Requires:      %{name}-lib = %{version}-%{release}
 Requires(post,preun):  /sbin/chkconfig
 Requires:      rc-scripts
@@ -44,33 +48,52 @@ This utility allows system administator to control OpenVZ containers,
 i.e. create, start, shutdown, set various options and limits etc.
 
 %description -l pl.UTF-8
-Narzędzia vztcl pozwalają kontrolować środowisko wirtualne (kontener)
-OpenVZ, jak na przykład: utworzenie, zatrzymanie, wyłączenie kontenera
-oraz umożliwia ustawienie opcji i limitów dotyczących kontenera.
+Narzędzia vztcl pozwalają administratorowi zarządzać środowiskami
+wirtualnymi (kontenerami) OpenVZ, tzn. tworzyć je, uruchamiać,
+zatrzymywać, ustawiać różne opcje i limity itp.
 
 %package lib
 Summary:       OpenVZ containers control API library
+Summary(pl.UTF-8):     Biblioteka do zarządzania kontenerami OpenVZ
 Group:         Libraries
+Requires:      libxml2 >= 1:2.6.1.6
 
 %description lib
 OpenVZ containers control API library.
 
+%description lib -l pl.UTF-8
+Biblioteka do zarządzania kontenerami OpenVZ
+
+%package -n bash-completion-%{name}
+Summary:       bash-completion for vzctl
+Summary(pl.UTF-8):     bashowe uzupełnianie linii poleceń dla vzctl
+Group:         Applications/Shells
+Requires:      bash-completion
+
+%description -n bash-completion-%{name}
+This package provides bash-completion for vzctl.
+
+%description -n bash-completion-%{name} -l pl.UTF-8
+Pakiet ten dostarcza bashowe uzupełnianie linii poleceń dla vzctl.
+
 %prep
 %setup -q
 %patch0 -p1
-install %{SOURCE1} etc/dists
-install %{SOURCE2} %{SOURCE3} %{SOURCE4} etc/dists/scripts
-install %{SOURCE5} %{SOURCE6} etc/init.d
+cp -p %{SOURCE1} etc/dists
+install -p %{SOURCE2} %{SOURCE3} %{SOURCE4} etc/dists/scripts
+install -p %{SOURCE5} %{SOURCE6} etc/init.d
 
 %build
+%{__libtoolize}
 %{__aclocal}
+%{__autoconf}
 %{__automake}
 %configure \
+       --disable-silent-rules \
        --enable-bashcomp \
-       --enable-logrotate \
-       --disable-static
+       --enable-logrotate
 
-%{__make} -j1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -88,8 +111,8 @@ ln -s ../vz/vz.conf $RPM_BUILD_ROOT/etc/sysconfig/vz
 
 :> $RPM_BUILD_ROOT/etc/cron.d/vz
 
-# .so could go to vzctl-lib-devel, but since we don't have it...
-rm -f $RPM_BUILD_ROOT%{_libdir}/libvzctl.{la,so}
+# this could go to vzctl-lib-devel, but since we don't have it...
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvzctl.{la,so}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,7 +130,7 @@ fi
 %service vzeventd restart "vzeventd service"
 
 %preun
-if [ $1 = 0 ]; then
+if [ "$1" = 0 ]; then
        /sbin/chkconfig --del vz
        /sbin/chkconfig --del vzeventd
 fi
@@ -117,10 +140,11 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog
-%config(noreplace) /etc/bash_completion.d/%{name}.sh
 %attr(640,root,root) %ghost /etc/cron.d/vz
-%attr(754,root,root) /etc/rc.d/init.d/vz*
+%attr(754,root,root) /etc/rc.d/init.d/vz
+%attr(754,root,root) /etc/rc.d/init.d/vzeventd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
+%dir /etc/sysconfig/network-scripts
 %attr(755,root,root) /etc/sysconfig/network-scripts/if*-venet
 %attr(640,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) /etc/sysconfig/interfaces/ifcfg-venet0
 %dir /etc/sysconfig/vz-scripts
@@ -139,16 +163,27 @@ fi
 %{_configdir}/names
 %config(noreplace) %verify(not md5 mtime size) %{_configdir}/*conf
 %attr(755,root,root) /sbin/ifup-local
-%attr(755,root,root) %{_sbindir}/*send
+%attr(755,root,root) %{_sbindir}/arpsend
+%attr(755,root,root) %{_sbindir}/ndsend
 %attr(755,root,root) %{_sbindir}/vz*
 %dir /vz
-/vz/[dlt]*
-%attr(700,root,root) %dir /vz/[pr]*
+/vz/dump
+/vz/lock
+/vz/template
+%attr(700,root,root) %dir /vz/private
+%attr(700,root,root) %dir /vz/root
 /var/lib/vzctl
-%{_mandir}/man5/*.5*
-%{_mandir}/man8/*.8*
+%{_mandir}/man5/ctid.conf.5*
+%{_mandir}/man5/vz.conf.5*
+%{_mandir}/man8/arpsend.8*
+%{_mandir}/man8/ndsend.8*
+%{_mandir}/man8/vz*.8*
 
 %files lib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libvzctl-*.so
 %attr(755,root,root) %{_libdir}/vzctl
+
+%files -n bash-completion-%{name}
+%defattr(644,root,root,755)
+/etc/bash_completion.d/%{name}.sh