packages: libvirt/libvirt.spec - added sanlock lock driver (as subpackage) ...

Sat Oct 22 09:21:47 CEST 2011

Author: qboosh                       Date: Sat Oct 22 07:21:47 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added sanlock lock driver (as subpackage)
- some dir attrs taken from RH/FC spec

---- Files affected:
packages/libvirt:
   libvirt.spec (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: packages/libvirt/libvirt.spec
diff -u packages/libvirt/libvirt.spec:1.41 packages/libvirt/libvirt.spec:1.42

--- packages/libvirt/libvirt.spec:1.41	Sat Oct  1 09:33:34 2011
+++ packages/libvirt/libvirt.spec	Sat Oct 22 09:21:42 2011
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-# sanlock, xenapi (libxenserver), xenlight (libxenlight)?
+# xenapi (libxenserver), xenlight (libxenlight)?
 # --with-driver-modules ?
 #
 # Conditional build:
@@ -7,6 +7,7 @@
 %bcond_without	xen_proxy	# Xen proxy
 %bcond_without	qemu		# Qemu
 %bcond_without	polkit		# PolicyKit
+%bcond_without	sanlock		# sanlock storage lock manager
 %bcond_with	netcf		# host interfaces support
 
 # qemu available only on x86 and ppc
@@ -72,6 +73,7 @@
 BuildRequires:	readline-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
+%{?with_sanlock:BuildRequires:	sanlock-devel >= 0.8}
 BuildRequires:	udev-devel >= 145
 %{?with_xen:BuildRequires:	xen-devel >= 3.0.4}
 # For disk driver
@@ -222,6 +224,18 @@
 
 Ten pakiet zawiera narzędzia do biblioteki libvirt.
 
+%package lock-sanlock
+Summary:	Sanlock lock manager plugin for libvirt
+Summary(pl.UTF-8):	Zarządca blokad sanlock dla biblioteki libvirt
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description lock-sanlock
+Sanlock lock manager plugin for libvirt.
+
+%description lock-sanlock -l pl.UTF-8
+Zarządca blokad sanlock dla biblioteki libvirt.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -240,17 +254,6 @@
 %{__automake}
 
 %configure \
-	--disable-silent-rules \
-	--with-html-dir=%{_gtkdocdir} \
-	--with-html-subdir=%{name} \
-	--x-libraries=%{_libdir} \
-	%{!?with_xen:--without-xen} \
-	%{!?with_qemu:--without-qemu} \
-	%{!?with_netcf:--without-netcf} \
-	--with-init-script=redhat \
-	--with-storage-lvm \
-	--without-hal \
-	--with-udev \
 	PVCREATE=/sbin/pvcreate \
 	VGCREATE=/sbin/vgcreate \
 	LVCREATE=/sbin/lvcreate \
@@ -275,7 +278,19 @@
 	DNSMASQ=/usr/sbin/dnsmasq \
 	RADVD=/usr/sbin/radvd \
 	UDEVADM=/sbin/udevadm \
-	MODPROBE=/sbin/modprobe
+	MODPROBE=/sbin/modprobe \
+	--disable-silent-rules \
+	--with-html-dir=%{_gtkdocdir} \
+	--with-html-subdir=%{name} \
+	--with-init-script=redhat \
+	--with-storage-lvm \
+	--with-udev \
+	--without-hal \
+	%{!?with_netcf:--without-netcf} \
+	%{!?with_sanlock:--without-sanlock} \
+	%{!?with_qemu:--without-qemu} \
+	%{!?with_xen:--without-xen} \
+	--x-libraries=%{_libdir}
 
 %{__make} \
 	AWK=gawk
@@ -297,6 +312,10 @@
 %py_postclean
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.la
 
+%if %{with sanlock}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.{a,la}
+%endif
+
 %find_lang %{name}
 
 %clean
@@ -314,6 +333,9 @@
 %attr(755,root,root) %ghost %{_libdir}/libvirt-qemu.so.0
 %attr(755,root,root) %{_libdir}/libvirt_lxc
 %attr(755,root,root) %{_libdir}/libvirt_iohelper
+%attr(755,root,root) %{_libdir}/virt-aa-helper
+%dir %{_libdir}/libvirt
+%dir %{_libdir}/libvirt/lock-driver
 %dir %{_datadir}/libvirt
 %dir %{_datadir}/libvirt/schemas
 %{_datadir}/libvirt/schemas/basictypes.rng
@@ -331,6 +353,14 @@
 %{_datadir}/libvirt/schemas/storagepool.rng
 %{_datadir}/libvirt/schemas/storagevol.rng
 
+%if %{with sanlock}
+%files lock-sanlock
+%attr(755,root,root) %{_sbindir}/virt-sanlock-cleanup
+%attr(755,root,root) %{_libdir}/libvirt/lock-driver/sanlock.so
+%dir /var/lib/libvirt/sanlock
+%{_mandir}/man8/virt-sanlock-cleanup.8*
+%endif
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libvirt.so
@@ -370,8 +400,7 @@
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.lxc
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.qemu
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.uml
-%{_libdir}/libvirt_parthelper
-%{_libdir}/virt-aa-helper
+%attr(755,root,root) %{_libdir}/libvirt_parthelper
 %{?with_polkit:%{_datadir}/polkit-1/actions/org.libvirt.unix.policy}
 %{_mandir}/man1/virsh.1*
 %{_mandir}/man1/virt-xml-validate.1*
@@ -380,8 +409,27 @@
 %{_datadir}/%{name}/*.xml
 %{_datadir}/augeas/lenses/*.aug
 %{_datadir}/augeas/lenses/tests/*.aug
-%dir /var/run/libvirt
+%attr(711,root,root) %dir /var/cache/libvirt
 %dir /var/lib/libvirt
+%attr(711,root,root) %dir /var/lib/libvirt/boot
+%dir /var/lib/libvirt/dnsmasq
+%attr(711,root,root) %dir /var/lib/libvirt/images
+%attr(700,root,root) %dir /var/lib/libvirt/lxc
+%attr(700,root,root) %dir /var/lib/libvirt/network
+%attr(700,root,root) %dir /var/lib/libvirt/uml
+%dir /var/log/libvirt
+%attr(700,root,root) %dir /var/log/libvirt/lxc
+%attr(700,root,root) %dir /var/log/libvirt/uml
+%dir /var/run/libvirt
+%attr(700,root,root) %dir /var/run/libvirt/lxc
+%if %{with qemu}
+# %attr(750,qemu,qemu) ?
+%dir /var/cache/libvirt/qemu
+# %attr(750,qemu,qemu) ?
+%dir /var/lib/libvirt/qemu
+%attr(700,root,root) %dir /var/log/libvirt/qemu
+%attr(700,root,root) %dir /var/run/libvirt/qemu
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -389,6 +437,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2011/10/22 07:21:42  qboosh
+- added sanlock lock driver (as subpackage)
+- some dir attrs taken from RH/FC spec
+
 Revision 1.41  2011/10/01 07:33:34  qboosh
 - use openwsman
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libvirt/libvirt.spec?r1=1.41&r2=1.42&f=u

