From 639f6272901ecaa34ddd33e7f7889448135daa73 Mon Sep 17 00:00:00 2001
From: Peter Rajnoha <prajnoha@fedoraproject.org>
Date: Nov 03 2009 11:46:20 +0000
Subject: Enable udev synchronisation code and install default udev rules.


---

diff --git a/lvm2.spec b/lvm2.spec
index 7db8c19..178ebeb 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -9,7 +9,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.54
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -26,6 +26,7 @@ BuildRequires: openaislib-devel >= %{openais_version}
 BuildRequires: clusterlib-devel >= %{clusterlib_version}
 BuildRequires: module-init-tools
 BuildRequires: pkgconfig
+BuildRequires: libudev-devel
 Requires: device-mapper >= %{device_mapper_version}-%{release}
 Requires: device-mapper-event >= %{device_mapper_version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
@@ -52,8 +53,10 @@ or more physical volumes and creating one or more logical volumes
 %define _bindir /bin
 %define _sbindir /sbin
 %define _libdir /%{_lib}
+%define _udevbasedir /lib/udev
+%define _udevdir %{_udevbasedir}/rules.d
 
-%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,openais,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd
+%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=cman,openais,corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-udevdir=%{_udevdir} --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd --enable-udev_sync
 
 make %{?_smp_mflags}
 
@@ -176,6 +179,7 @@ fi
 %{_mandir}/man8/vgs.8.gz
 %{_mandir}/man8/vgscan.8.gz
 %{_mandir}/man8/vgsplit.8.gz
+%{_udevdir}/11-dm-lvm.rules
 %dir /etc/lvm
 %ghost /etc/lvm/cache/.cache
 %config(noreplace) /etc/lvm/lvm.conf
@@ -278,6 +282,11 @@ License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
 Requires: device-mapper-libs = %{device_mapper_version}-%{release}
+Requires: libudev
+Requires: util-linux-ng >= 2.15
+# We need dracut to install required udev rules if udev_sync
+# feature is turned on so we don't lose required notifications.
+Conflicts: dracut < 002-18
 
 %description -n device-mapper
 This package contains the supporting userspace utility, dmsetup,
@@ -285,9 +294,14 @@ for the kernel device-mapper.
 
 %files -n device-mapper
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LIB WHATS_NEW_DM VERSION_DM README INSTALL
+%doc COPYING COPYING.LIB WHATS_NEW_DM VERSION_DM README INSTALL udev/12-dm-permissions.rules
 %attr(755,root,root) /sbin/dmsetup
 %{_mandir}/man8/dmsetup.8.gz
+%dir %{_udevbasedir}
+%dir %{_udevdir}
+%{_udevdir}/10-dm.rules
+%{_udevdir}/13-dm-disk.rules
+%{_udevdir}/95-dm-notify.rules
 
 %package -n device-mapper-devel
 Summary: Development libraries and headers for device-mapper
@@ -382,6 +396,14 @@ the device-mapper event library.
 
 
 %changelog
+* Tue Nov 3 2009 Peter Rajnoha <prajnoha@redhat.com> - 2.02.54-2
+- Enable udev synchronisation code.
+- Install default udev rules for device-mapper and LVM2.
+- Add BuildRequires: libudev-devel.
+- Add Requires: libudev (to check udev is running).
+- Add Requires: util-linux-ng (blkid used in udev rules).
+- Add Conflicts: dracut < 002-18 (for dracut to install required udev rules)
+
 * Tue Oct 27 2009 Alasdair Kergon <agk@redhat.com> - 2.02.54-1
 - Add implict pvcreate support to vgcreate and vgextend.
 - Add --pvmetadatacopies for pvcreate, vgcreate, vgextend, vgconvert.