- put xend udev config file into the -xend subpackage

[packages/xen.git] / xen.spec

diff --git a/xen.spec b/xen.spec
index 2ed0e80dbccef16430ffc430a9a5b10a6f14856c..2561929bd838063d26219a72c4f203f9a7ec1b5c 100644 (file)
--- a/xen.spec
+++ b/xen.spec
@@ -3,12 +3,16 @@
 #  - most of the qemu config options aren't detected (curses, NPTL, vde, fdt)
 #  - package the ocaml stuff
 #
+#
+# Conditional build:
+%bcond_with    ocaml           # build Ocaml libraries for Xen tools
+#
 %define        xen_extfiles_url        http://xenbits.xensource.com/xen-extfiles
 Summary:       Xen - a virtual machine monitor
 Summary(pl.UTF-8):     Xen - monitor maszyny wirtualnej
 Name:          xen
 Version:       4.1.2
-Release:       0.1
+Release:       2
 License:       GPL
 Group:         Applications/System
 Source0:       http://bits.xensource.com/oss-xen/release/%{version}/%{name}-%{version}.tar.gz
@@ -60,6 +64,7 @@ Patch10:      xend-pci-loop.patch
 Patch11:       xen-dumpdir.patch
 Patch12:       xen-net-disable-iptables-on-bridge.patch
 Patch13:       xen-configure-xend.patch
+Patch14:       xen-initscript.patch
 # stubdom patch
 Patch100:      grub-ext4-support.patch
 URL:           http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -73,11 +78,16 @@ BuildRequires:      gettext-devel
 BuildRequires: latex2html
 BuildRequires: libidn-devel
 BuildRequires: ncurses-devel
+%if %{with ocaml}
+BuildRequires: ocaml >= 3.04-7
+BuildRequires: ocaml-findlib
+%requires_eq   ocaml-runtime
+%endif
 BuildRequires: pciutils-devel
 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
@@ -97,6 +107,7 @@ Requires:    net-tools
 Requires:      python-%{name} = %{version}-%{release}
 Requires:      rc-scripts
 Requires:      sed
+Requires:      systemd-units >= 38
 Requires:      util-linux
 Requires:      which
 Obsoletes:     xen-doc
@@ -172,6 +183,7 @@ Statyczne biblioteki xena.
 Summary:       xend daemon
 Summary(pl.UTF-8):     Demon xend
 Group:         Daemons
+Requires:      systemd-units >= 38
 
 %description xend
 xend daemon.
@@ -216,6 +228,7 @@ This package provides bash-completion for xen.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %{__rm} -v tools/check/*.orig
 
@@ -229,6 +242,7 @@ export CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 export CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 
 %{__make} dist-xen dist-tools dist-docs \
+       %{!?with_ocaml:OCAML_TOOLS=n} \
        prefix=%{_prefix} \
        CC="%{__cc}" \
        CXX="%{__cxx}"
@@ -236,15 +250,17 @@ export CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 unset CFLAGS
 unset CXXFLAGS
 %{__make} -j1 dist-stubdom \
+       %{!?with_ocaml:OCAML_TOOLS=n} \
        CC="%{__cc}" \
        CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{xen/examples,modules-load.d,logrotate.d} \
-       $RPM_BUILD_ROOT{/usr/lib/tmpfiles.d,%{systemdunitdir}}
+       $RPM_BUILD_ROOT{/usr/lib/tmpfiles.d,%{systemdunitdir},/var/log/xen/console}
 
 %{__make} -j1 install-xen install-tools install-stubdom install-docs \
+       %{!?with_ocaml:OCAML_TOOLS=n} \
        prefix=%{_prefix} \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -254,9 +270,8 @@ ln -s %{_prefix}/lib/%{name}/bin/qemu-dm $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/q
 
 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
@@ -299,6 +314,7 @@ rm -rf $RPM_BUILD_ROOT
 /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
@@ -314,15 +330,24 @@ if [ "$1" = "0" ]; then
        %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
@@ -359,7 +384,7 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/README*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/cpupool
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/xl.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/*
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/xen-backend.rules
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/[bfgikloqtv]*
 %attr(755,root,root) %{_sbindir}/xen??*
@@ -378,7 +403,9 @@ fi
 %dir %{_prefix}/lib/%{name}/boot
 %{_prefix}/lib/%{name}/boot/ioemu-stubdom.gz
 %{_prefix}/lib/%{name}/boot/pv-grub-x86_32.gz
+%ifarch %{x8664}
 %{_prefix}/lib/%{name}/boot/pv-grub-x86_64.gz
+%endif
 %attr(744,root,root) %{_prefix}/lib/%{name}/boot/hvmloader
 %{_datadir}/xen
 %{_mandir}/man?/*
@@ -386,6 +413,8 @@ fi
 %{_sharedstatedir}/xenstored
 %dir /var/run/xenstored
 %{systemdtmpfilesdir}/xenstored.conf
+%dir %attr(0700,root,root) /var/log/xen
+%dir %attr(0700,root,root) /var/log/xen/console
 
 %files libs
 %defattr(644,root,root,755)
@@ -410,10 +439,11 @@ fi
 
 %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
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/xend.rules
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/xm*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/xend*
 %attr(755,root,root) %{_sbindir}/xend