diff --git a/lvm2.changes b/lvm2.changes index 47e4577..9a0c996 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 15 11:44:36 UTC 2013 - rmilasan@suse.com + +- Move all udev releated files in the appropriate udev directory. + ------------------------------------------------------------------- Wed Nov 28 09:37:23 UTC 2012 - rmilasan@suse.com diff --git a/lvm2.spec b/lvm2.spec index ab0df64..d73c36f 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -1,7 +1,7 @@ # # spec file for package lvm2 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -74,7 +74,7 @@ Obsoletes: evms <= 2.5.5 Obsoletes: evms-devel <= 2.5.5 Obsoletes: evms-gui <= 2.5.5 Obsoletes: evms-ha <= 2.5.5 -%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d +%define _udevdir %(pkg-config --variable=udevdir udev) %description Programs and man pages for configuring and using the LVM2 Logical @@ -105,7 +105,7 @@ export MODPROBE_CMD=/sbin/modprobe %configure --prefix=/ \ --bindir=/bin --libdir=/%_lib --with-usrlibdir=%_libdir \ --sbindir=/sbin --enable-dmeventd \ - --with-udevdir=%{_udevrulesdir} \ + --with-udevdir=%{_udevdir}/rules.d \ --with-dmeventd_path=/sbin/dmeventd \ --with-device-uid=0 --with-device-gid=6 --with-device-mode=0640 \ --enable-udev_sync --enable-udev_rules \ @@ -148,7 +148,7 @@ mv $RPM_BUILD_ROOT/sbin/clvmd $RPM_BUILD_ROOT/usr/sbin/clvmd mkdir -p $RPM_BUILD_ROOT/usr/share rm $RPM_BUILD_ROOT/usr/include/lvm2cmd.h # install and collect_lvm -install -m755 -D %{S:7} $RPM_BUILD_ROOT/lib/udev/collect_lvm +install -m755 -D %{S:7} $RPM_BUILD_ROOT%{_udevdir}/collect_lvm %post %{fillup_and_insserv -n lvm boot.lvm} @@ -188,8 +188,8 @@ fi %config /etc/init.d/boot.lvm %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts -%{_udevrulesdir}/11-dm-lvm.rules -/lib/udev/collect_lvm +%{_udevdir}/rules.d/11-dm-lvm.rules +%{_udevdir}/collect_lvm /lib/mkinitrd/scripts/setup-lvm2.sh /lib/mkinitrd/scripts/boot-lvm2.sh /var/adm/fillup-templates/sysconfig.lvm @@ -337,10 +337,10 @@ mapper. %config /etc/init.d/boot.device-mapper /%_lib/libdevmapper.so.1.02 /%_lib/libdevmapper-event.so.1.02 -%{_udevrulesdir}/10-dm.rules -#/lib/udev/rules.d/12-dm-permissions.rules -%{_udevrulesdir}/13-dm-disk.rules -%{_udevrulesdir}/95-dm-notify.rules +%{_udevdir}/rules.d/10-dm.rules +#%{_udevdir}/rules.d/12-dm-permissions.rules +%{_udevdir}/rules.d/13-dm-disk.rules +%{_udevdir}/rules.d/95-dm-notify.rules /sbin/dmsetup /sbin/dmeventd %{_mandir}/man8/dmsetup.8.gz