packages: vzctl/vzctl.spec - more cleanup

[gotar]

Author: gotar                        Date: Thu Jan 27 22:58:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more cleanup

---- Files affected:
packages/vzctl:
   vzctl.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/vzctl/vzctl.spec
diff -u packages/vzctl/vzctl.spec:1.4 packages/vzctl/vzctl.spec:1.5
--- packages/vzctl/vzctl.spec:1.4	Thu Jan 27 23:42:06 2011
+++ packages/vzctl/vzctl.spec	Thu Jan 27 23:58:17 2011
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-%define _initddir /etc/rc.d/init.d
 %define _vzdir /vz
 %define _lockdir %{_vzdir}/lock
 %define _dumpdir %{_vzdir}/dump
@@ -28,7 +27,7 @@
 License:	GPL
 Group:		Base/Kernel
 Source0:	http://download.openvz.org/utils/vzctl/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	d02fdecaeaa1327c08ba5d980383cafa
+# Source0-md5:	5798ea88d06afff1d6d1bbbfc45899f1
 URL:		http://openvz.org/
 Requires:	%{name}-lib = %{version}-%{release}
 # these reqs are for vz helper scripts
@@ -40,12 +39,11 @@
 Requires:	grep
 Requires:	sed
 Requires:	tar
-Requires:	vzkernel
 Requires:	vzquota >= 2.7.0-4
 # requires for vzmigrate purposes
-Requires:	gawk
-Requires:	openssh
-Requires:	rsync
+Suggests:	gawk
+Suggests:	openssh
+Suggests:	rsync
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -83,12 +81,13 @@
 
 ln -s ../sysconfig/vz-scripts $RPM_BUILD_ROOT%{_configdir}/conf
 ln -s ../vz/vz.conf $RPM_BUILD_ROOT/etc/sysconfig/vz
-# .so could go to vzctl-lib-devel, but since we don't have it...
-rm -f $RPM_BUILD_ROOT{%_libdir}/libvzctl.{la,so}
 # Needed for ghost in files section below
 mkdir $RPM_BUILD_ROOT/etc/cron.d/
 touch $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}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -109,7 +108,8 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_initddir}/vz
+%doc ChangeLog
+%attr(755,root,root) /etc/rc.d/init.d/vz
 %ghost /etc/cron.d/vz
 %dir %{_lockdir}
 %dir %{_dumpdir}
@@ -118,7 +118,6 @@
 %dir %{_cachedir}
 %dir %{_veipdir}
 %dir %{_configdir}
-%dir %{_crondir}
 %dir %{_namesdir}
 %dir %{_vpsconfdir}
 %dir %{_distconfdir}
@@ -132,8 +131,7 @@
 %{_distconfdir}/default
 %attr(755,root,root) %{_distscriptdir}/*.sh
 %{_distscriptdir}/functions
-%attr(755,root,root) %{_netdir}/ifup-venet
-%attr(755,root,root) %{_netdir}/ifdown-venet
+%attr(755,root,root) %{_netdir}/if*-venet
 %{_netdir}/ifcfg-venet0
 %{_mandir}/man5/*.5*
 %{_mandir}/man8/*.8*
@@ -143,8 +141,7 @@
 %config(noreplace) %{_configdir}/vz.conf
 %config(noreplace) %{_distconfdir}/*.conf
 %config(noreplace) %{_crondir}/vz
-%config %{_vpsconfdir}/ve-vps.basic.conf-sample
-%config %{_vpsconfdir}/ve-light.conf-sample
+%config %{_vpsconfdir}/ve-*.conf-sample
 %config %{_vpsconfdir}/0.conf
 
 %attr(777, root, root) %{_sysconfdir}/vz/conf
@@ -165,6 +162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/01/27 22:58:17  gotar
+- more cleanup
+
 Revision 1.4  2011/01/27 22:42:06  gotar
 - cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vzctl/vzctl.spec?r1=1.4&r2=1.5&f=u