X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=vzctl.spec;h=7767a53099afa27c16d25a46b98adf098e97b668;hb=c0c1a0b978375be4c9af02576ffcb2eeafae361b;hp=b9e176b5b60fb1b2b76cb166f6cc87b4d97c2a04;hpb=82e58e2a72fee91c1f08dd70c7ea0cd7cb973d1d;p=packages%2Fvzctl.git

diff --git a/vzctl.spec b/vzctl.spec
index b9e176b..7767a53 100644
--- a/vzctl.spec
+++ b/vzctl.spec
@@ -1,13 +1,26 @@
 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
+Source4:	pld-set_hostname.sh
+Source5:	vz-pld.in
+Source6:	vzeventd-pld.in
+Patch0:		%{name}-pld.patch
 URL:		http://openvz.org/
+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
@@ -35,42 +48,71 @@ 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
+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}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/cron.d
+install -d $RPM_BUILD_ROOT/etc/{cron.d,rc.d/init.d,sysconfig/interfaces}
 
-%{__make} install install-redhat \
+%{__make} install install-pld \
+	vpsconfdir=/etc/sysconfig/vz-scripts \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__mv} $RPM_BUILD_ROOT/etc/init.d/vz* $RPM_BUILD_ROOT/etc/rc.d/init.d
+%{__mv} $RPM_BUILD_ROOT/etc/sysconfig/{network-scripts,interfaces}/ifcfg-venet0
+
 ln -s ../sysconfig/vz-scripts $RPM_BUILD_ROOT%{_configdir}/conf
 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
@@ -79,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 /bin/rm -rf /dev/vzctl
 /bin/mknod -m 600 /dev/vzctl c 126 0
 if [ -f %{_configdir}/vz.conf ]; then
-	if ! grep "IPTABLES=" %{_configdir}/vz.conf >/dev/null 2>&1; then
+	if ! grep -q "IPTABLES=" %{_configdir}/vz.conf 2>/dev/null; then
 		echo 'IPTABLES="ipt_REJECT ipt_tos ipt_limit ipt_multiport iptable_filter iptable_mangle ipt_TCPMSS ipt_tcpmss ipt_ttl ipt_length"' >> %{_configdir}/vz.conf
 	fi
 fi
@@ -88,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
@@ -98,12 +140,12 @@ 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
-	%{_netdir}/ifcfg-venet0
 %attr(640,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) /etc/sysconfig/interfaces/ifcfg-venet0
 %dir /etc/sysconfig/vz-scripts
 %config(missingok) /etc/sysconfig/vz-scripts/ve-*.conf-sample
@@ -114,22 +156,34 @@ fi
 %dir %{_distconfdir}
 %config(noreplace) %verify(not md5 mtime size) %{_distconfdir}/default
 %config(noreplace) %{_distconfdir}/distribution.conf-template
-%config(noreplace) %{_distconfdir}/*conf
+%config(noreplace) %{_distconfdir}/*.conf
 %dir %{_distscriptdir}
 %attr(755,root,root) %config(noreplace) %{_distscriptdir}/*.sh
 %config(noreplace) %{_distscriptdir}/functions
 %{_configdir}/names
-%config(noreplace) %verify(not md5 mtime size) %{_configdir}/*.conf
-%attr(755,root,root) %{_sbindir}/*send
+%config(noreplace) %verify(not md5 mtime size) %{_configdir}/*conf
+%attr(755,root,root) /sbin/ifup-local
+%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]*
-/var/lib/vzctl/veip
-%{_mandir}/man5/*.5*
-%{_mandir}/man8/*.8*
+/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/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