packages: vzctl/vzctl.spec - get rid of all the _uselessdir, they are hardc...
gotar
gotar at pld-linux.org
Fri Jan 28 01:18:53 CET 2011
Author: gotar Date: Fri Jan 28 00:18:53 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- get rid of all the _uselessdir, they are hardcoded in paths.am anyway
---- Files affected:
packages/vzctl:
vzctl.spec (1.6 -> 1.7)
---- Diffs:
================================================================
Index: packages/vzctl/vzctl.spec
diff -u packages/vzctl/vzctl.spec:1.6 packages/vzctl/vzctl.spec:1.7
--- packages/vzctl/vzctl.spec:1.6 Fri Jan 28 00:20:42 2011
+++ packages/vzctl/vzctl.spec Fri Jan 28 01:18:48 2011
@@ -1,29 +1,18 @@
# $Revision$, $Date$
-%define _pkglibdir %{_libdir}/vzctl
-%define _configdir %{_sysconfdir}/vz
-%define _scriptdir /usr/share/vzctl/scripts
-%define _vpsconfdir /etc/sysconfig/vz-scripts
-%define _netdir /etc/sysconfig/network-scripts
-%define _logrdir /etc/logrotate.d
-%define _distconfdir %{_configdir}/dists
-%define _namesdir %{_configdir}/names
-%define _distscriptdir %{_distconfdir}/scripts
-%define _udevrulesdir /etc/udev/rules.d
-%define _bashcdir /etc/bash_completion.d
-
Summary: OpenVZ containers control utility
Summary(pl.UTF-8): Narzędzie do zarządzania środowiskiem wirtualnym OpenVZ
Name: vzctl
Version: 3.0.25.1
-Release: 0.1
+Release: 1
License: GPL
Group: Base/Kernel
Source0: http://download.openvz.org/utils/vzctl/%{version}/src/%{name}-%{version}.tar.bz2
# Source0-md5: 5798ea88d06afff1d6d1bbbfc45899f1
URL: http://openvz.org/
Requires: %{name}-lib = %{version}-%{release}
+Requires(post,preun): /sbin/chkconfig
+Requires: rc-scripts
# these reqs are for vz helper scripts
-Requires: /sbin/chkconfig
Requires: bash
Requires: ed
Requires: fileutils
@@ -38,6 +27,10 @@
Suggests: rsync
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _configdir %{_sysconfdir}/vz
+%define _distconfdir %{_configdir}/dists
+%define _distscriptdir %{_distconfdir}/scripts
+
%description
This utility allows system administator to control OpenVZ containers,
i.e. create, start, shutdown, set various options and limits etc.
@@ -49,7 +42,7 @@
%package lib
Summary: OpenVZ containers control API library
-Group: Base/Kernel
+Group: Libraries
%description lib
OpenVZ containers control API library.
@@ -67,16 +60,15 @@
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/cron.d
+
%{__make} install install-redhat \
- vpsconfdir=%{_vpsconfdir} \
DESTDIR=$RPM_BUILD_ROOT
ln -s ../sysconfig/vz-scripts $RPM_BUILD_ROOT%{_configdir}/conf
ln -s ../vz/vz.conf $RPM_BUILD_ROOT/etc/sysconfig/vz
-# Needed for ghost in files section below
-mkdir $RPM_BUILD_ROOT/etc/cron.d/
-touch $RPM_BUILD_ROOT/etc/cron.d/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}
@@ -93,10 +85,13 @@
fi
fi
/sbin/chkconfig --add vz
+/sbin/chkconfig --add vzeventd
+%service vzeventd restart "vzeventd service"
%preun
if [ $1 = 0 ]; then
/sbin/chkconfig --del vz
+ /sbin/chkconfig --del vzeventd
fi
%post lib -p /sbin/ldconfig
@@ -104,43 +99,36 @@
%files
%defattr(644,root,root,755)
%doc ChangeLog
-%attr(754,root,root) /etc/rc.d/init.d/vz*
-%ghost /etc/cron.d/vz
-
-%dir /vz
-/vz/[dlt]*
-%dir %attr(700,root,root) /vz/private
-%dir %attr(700,root,root) /vz/root
-/var/lib/vzctl/veip
-
+%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(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
+%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
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vz-scripts/0.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vz
+%config(noreplace) /etc/udev/rules.d/*-%{name}.rules
%dir %{_configdir}
-%dir %{_namesdir}
-%dir %{_vpsconfdir}
%dir %{_distconfdir}
+%config(noreplace) %verify(not md5 mtime size) %{_distconfdir}/default
+%config(noreplace) %{_distconfdir}/distribution.conf-template
+%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
%attr(755,root,root) %{_sbindir}/vz*
-%attr(755,root,root) %{_scriptdir}/vps*
-%{_logrdir}/vzctl
-%{_distconfdir}/distribution.conf-template
-%{_distconfdir}/default
-%attr(755,root,root) %{_distscriptdir}/*.sh
-%{_distscriptdir}/functions
-%attr(755,root,root) %{_netdir}/if*-venet
-%{_netdir}/ifcfg-venet0
+%dir /vz
+/vz/[dlt]*
+%attr(700,root,root) %dir /vz/[pr]*
+/var/lib/vzctl/veip
%{_mandir}/man5/*.5*
%{_mandir}/man8/*.8*
-%{_udevrulesdir}/*
-%{_bashcdir}/*
-
-%config(noreplace) %{_configdir}/vz.conf
-%config(noreplace) %{_distconfdir}/*.conf
-%config %{_vpsconfdir}/ve-*.conf-sample
-%config %{_vpsconfdir}/0.conf
-
-%attr(777, root, root) %{_sysconfdir}/vz/conf
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vz
%files lib
%defattr(644,root,root,755)
@@ -153,6 +141,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2011/01/28 00:18:48 gotar
+- get rid of all the _uselessdir, they are hardcoded in paths.am anyway
+
Revision 1.6 2011/01/27 23:20:42 gotar
- cleaning up more RH-mess
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vzctl/vzctl.spec?r1=1.6&r2=1.7&f=u
More information about the pld-cvs-commit
mailing list