packages: xen/xen.spec - install blktapctrl service - add systemd bits

[baggins]

Author: baggins                      Date: Mon Mar  5 13:07:40 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install blktapctrl service
- add systemd bits

---- Files affected:
packages/xen:
   xen.spec (1.105 -> 1.106) 

---- Diffs:

================================================================
Index: packages/xen/xen.spec
diff -u packages/xen/xen.spec:1.105 packages/xen/xen.spec:1.106
--- packages/xen/xen.spec:1.105	Mon Mar  5 13:58:39 2012
+++ packages/xen/xen.spec	Mon Mar  5 14:07:35 2012
@@ -79,7 +79,7 @@
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.647
 #BuildRequires:	texlive-dvips
 #BuildRequires:	texlive-latex-data
 BuildRequires:	texlive-latex-psnfss
@@ -99,6 +99,7 @@
 Requires:	python-%{name} = %{version}-%{release}
 Requires:	rc-scripts
 Requires:	sed
+Requires:	systemd-units >= 38
 Requires:	util-linux
 Requires:	which
 Obsoletes:	xen-doc
@@ -174,6 +175,7 @@
 Summary:	xend daemon
 Summary(pl.UTF-8):	Demon xend
 Group:		Daemons
+Requires:	systemd-units >= 38
 
 %description xend
 xend daemon.
@@ -257,9 +259,8 @@
 
 install %{SOURCE30} $RPM_BUILD_ROOT%{systemdunitdir}/proc-xen.mount
 install %{SOURCE31} $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-xenstored.mount
-# started internally by xend
-#install %{SOURCE32} $RPM_BUILD_ROOT%{systemdunitdir}/blktapctrl.service
-#install %{SOURCE33} $RPM_BUILD_ROOT/etc/sysconfig/blktapctrl
+install %{SOURCE32} $RPM_BUILD_ROOT%{systemdunitdir}/blktapctrl.service
+install %{SOURCE33} $RPM_BUILD_ROOT/etc/sysconfig/blktapctrl
 install %{SOURCE34} $RPM_BUILD_ROOT%{systemdunitdir}/xenconsoled.service
 install %{SOURCE35} $RPM_BUILD_ROOT/etc/sysconfig/xenconsoled
 install %{SOURCE36} $RPM_BUILD_ROOT%{systemdunitdir}/xenstored.service
@@ -302,6 +303,7 @@
 /sbin/chkconfig --add xenconsoled
 /sbin/chkconfig --add xenstored
 /sbin/chkconfig --add xendomains
+%systemd_post xen-watchdog.service xenconsoled.service xenstored.service
 
 %preun
 if [ "$1" = "0" ]; then
@@ -317,15 +319,24 @@
 	%service xen-watchdog stop
 	/sbin/chkconfig --del xen-watchdog
 fi
+%systemd_preun xen-watchdog.service xenconsoled.service xenstored.service
 
-%post  xend
+%postun
+%systemd_reload
+
+%post xend
 /sbin/chkconfig --add xend
+%systemd_post xend.service
 
 %preun xend
 if [ "$1" = "0" ]; then
 	%service xend stop
 	/sbin/chkconfig --del xend
 fi
+%systemd_preun xend.service
+
+%postun xend
+%systemd_reload
 
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
@@ -413,8 +424,8 @@
 
 %files xend
 %defattr(644,root,root,755)
-#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/blktapctrl
-#%{systemdunitdir}/blktapctrl.service
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/blktapctrl
+%{systemdunitdir}/blktapctrl.service
 %{systemdunitdir}/xend.service
 %attr(754,root,root) %{_sysconfdir}/rc.d/init.d/xend
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/xm*
@@ -454,6 +465,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106  2012/03/05 13:07:35  baggins
+- install blktapctrl service
+- add systemd bits
+
 Revision 1.105  2012/03/05 12:58:39  baggins
 - we want to manage xend ourselves
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xen/xen.spec?r1=1.105&r2=1.106&f=u