SPECS (AC-branch): util-vserver.spec - merge rest of .214 from HEA...

[glen]

Author: glen                         Date: Tue Mar  4 15:12:20 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge rest of .214 from HEAD, cleanups, chost symlinks

---- Files affected:
SPECS:
   util-vserver.spec (1.138.2.24 -> 1.138.2.25) 

---- Diffs:

================================================================
Index: SPECS/util-vserver.spec
diff -u SPECS/util-vserver.spec:1.138.2.24 SPECS/util-vserver.spec:1.138.2.25
--- SPECS/util-vserver.spec:1.138.2.24	Tue Mar  4 15:59:54 2008
+++ SPECS/util-vserver.spec	Tue Mar  4 16:12:14 2008
@@ -3,6 +3,8 @@
 # - somewhy empty /var/cache/vservers is needed when building pld vserver
 # - make build create /dev/std{in,out,err} links
 # - reject install in %pre if /proc/virtual/info has incompatible version
+# - unpackaged
+#   /etc/rc.d/init.d/util-vserver -- # integrate to our initscript (util-vserver sets the path to vshelper and kills all guest processes)
 #
 # m68k and mips are the only not supported archs
 #
@@ -426,6 +428,9 @@
 %{__make} -j1 install install-distribution \
 	DESTDIR=$RPM_BUILD_ROOT
 
+rm -rf $RPM_BUILD_ROOT/dev
+rm -f $RPM_BUILD_ROOT/usr/lib/util-vserver/vserver-init.functions
+
 chmod -R +rX $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/*
 
 for i in $RPM_BUILD_ROOT/etc/rc.d/init.d/v_* ; do
@@ -462,8 +467,6 @@
 02 2 * * 0      root    %{_libdir}/%{name}/vhashify.cron
 EOF
 
-ln -sf null $RPM_BUILD_ROOT/dev/initctl
-
 # first platform file entry can't contain regexps
 echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/rpm/platform
 # x86_64 things
@@ -647,6 +650,7 @@
 %dir %{_sysconfdir}/vservers/.defaults/apps
 %dir %{_sysconfdir}/vservers/.defaults/files
 %{_sysconfdir}/vservers/.defaults/vdirbase
+%{_sysconfdir}/vservers/.defaults/cachebase
 %{_sysconfdir}/vservers/.defaults/run.rev
 /sbin/vshelper
 %attr(755,root,root) %{_sbindir}/chbind
@@ -734,12 +738,13 @@
 
 %files lib
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libvserver.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvserver.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %{?with_doc:%doc lib/apidoc/latex/refman.pdf lib/apidoc/html}
-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/libvserver.so
 %{_libdir}/lib*.la
 %{_includedir}/vserver*.h
 %{_pkgconfigdir}/*.pc
@@ -762,6 +767,9 @@
 %dir %{_sysconfdir}/vservers/.distributions/pld-th
 %dir %{_sysconfdir}/vservers/.distributions/pld-th/poldek
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-th/poldek/*.conf
+%dir %{_sysconfdir}/vservers/.distributions/pld-ti
+%dir %{_sysconfdir}/vservers/.distributions/pld-ti/poldek
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ti/poldek/*.conf
 %attr(755,root,root) %{_libdir}/%{name}/rpm-fake*
 %dir %{_libdir}/%{name}/distributions
 %attr(-,root,root) %{_libdir}/%{name}/distributions/defaults
@@ -877,6 +885,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.138.2.25  2008-03-04 15:12:14  glen
+- merge rest of .214 from HEAD, cleanups, chost symlinks
+
 Revision 1.138.2.24  2008-03-04 14:59:54  glen
 - cleanup pkgs list
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/util-vserver.spec?r1=1.138.2.24&r2=1.138.2.25&f=u