packages: vzctl/vzctl.spec - cleaning up more RH-mess

[gotar]

Author: gotar                        Date: Thu Jan 27 23:20:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleaning up more RH-mess

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

---- Diffs:

================================================================
Index: packages/vzctl/vzctl.spec
diff -u packages/vzctl/vzctl.spec:1.5 packages/vzctl/vzctl.spec:1.6
--- packages/vzctl/vzctl.spec:1.5	Thu Jan 27 23:58:17 2011
+++ packages/vzctl/vzctl.spec	Fri Jan 28 00:20:42 2011
@@ -1,18 +1,10 @@
 # $Revision$, $Date$
-%define _vzdir /vz
-%define _lockdir %{_vzdir}/lock
-%define _dumpdir %{_vzdir}/dump
-%define _privdir %{_vzdir}/private
-%define _rootdir %{_vzdir}/root
-%define _cachedir %{_vzdir}/template/cache
-%define _veipdir /var/lib/vzctl/veip
 %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 _crondir /etc/cron.d
 %define _distconfdir %{_configdir}/dists
 %define _namesdir %{_configdir}/names
 %define _distscriptdir %{_distconfdir}/scripts
@@ -81,6 +73,7 @@
 
 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
@@ -106,23 +99,26 @@
 	/sbin/chkconfig --del vz
 fi
 
+%post	lib -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog
-%attr(755,root,root) /etc/rc.d/init.d/vz
+%attr(754,root,root) /etc/rc.d/init.d/vz*
 %ghost /etc/cron.d/vz
-%dir %{_lockdir}
-%dir %{_dumpdir}
-%dir %attr(700,root,root) %{_privdir}
-%dir %attr(700,root,root) %{_rootdir}
-%dir %{_cachedir}
-%dir %{_veipdir}
+
+%dir /vz
+/vz/[dlt]*
+%dir %attr(700,root,root) /vz/private
+%dir %attr(700,root,root) /vz/root
+/var/lib/vzctl/veip
+
 %dir %{_configdir}
 %dir %{_namesdir}
 %dir %{_vpsconfdir}
 %dir %{_distconfdir}
 %dir %{_distscriptdir}
-%dir %{_vzdir}
+
 %attr(755,root,root) %{_sbindir}/*send
 %attr(755,root,root) %{_sbindir}/vz*
 %attr(755,root,root) %{_scriptdir}/vps*
@@ -140,7 +136,6 @@
 
 %config(noreplace) %{_configdir}/vz.conf
 %config(noreplace) %{_distconfdir}/*.conf
-%config(noreplace) %{_crondir}/vz
 %config %{_vpsconfdir}/ve-*.conf-sample
 %config %{_vpsconfdir}/0.conf
 
@@ -150,11 +145,7 @@
 %files lib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libvzctl-*.so
-%dir %{_pkglibdir}
-%dir %{_pkglibdir}/scripts
-%attr(755,root,root) %{_pkglibdir}/scripts/vps-*
-%attr(755,root,root) %{_pkglibdir}/scripts/vzevent-*
-%attr(755,root,root) %{_pkglibdir}/scripts/initd-functions
+%attr(755,root,root) %{_libdir}/vzctl
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -162,6 +153,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/01/27 23:20:42  gotar
+- cleaning up more RH-mess
+
 Revision 1.5  2011/01/27 22:58:17  gotar
 - more cleanup
 
================================================================

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