From d8c9c1f77b15e4a62728e8c66f7c075211288dee8efd01671a8c5e91da785629 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 7 Nov 2008 09:41:08 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mdadm?expand=0&rev=19 --- mdadm.changes | 5 +++++ mdadm.spec | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mdadm.changes b/mdadm.changes index 1e94a52..c634021 100644 --- a/mdadm.changes +++ b/mdadm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 7 10:32:35 CET 2008 - ro@suse.de + +- remove udev rule (conflicting with file in udev package) + ------------------------------------------------------------------- Fri Nov 7 02:58:40 CET 2008 - ro@suse.de diff --git a/mdadm.spec b/mdadm.spec index 58ffecb..343567e 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -20,7 +20,7 @@ Name: mdadm Version: 3.0 -Release: 5 +Release: 6 %define ver 3.0-devel2 BuildRequires: sgmltool PreReq: %fillup_prereq %insserv_prereq @@ -80,6 +80,8 @@ install -m 755 %{S:6} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-md.sh install -m 644 %{S:2} $RPM_BUILD_ROOT%{_var}/adm/fillup-templates/ ln -sf ../../etc/init.d/mdadmd $RPM_BUILD_ROOT/%{_sbindir}/rcmdadmd install -d $RPM_BUILD_ROOT/var/run/mdadm +# remove here, using the one in the udev package +rm -f $RPM_BUILD_ROOT/lib/udev/rules.d/64-md-raid.rules %post [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup @@ -135,7 +137,8 @@ rm -rf $RPM_BUILD_ROOT %doc Software-RAID.HOWTO/Software-RAID.HOWTO*{.txt,.html} %doc %{_mandir}/man?/* /sbin/* -/lib/udev +%dir /lib/udev +%dir /lib/udev/devices %{_sbindir}/* %{_var}/adm/fillup-templates/sysconfig.mdadm %dir /var/run/mdadm @@ -146,6 +149,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Fri Nov 07 2008 ro@suse.de +- remove udev rule (conflicting with file in udev package) +* Fri Nov 07 2008 ro@suse.de - buildfix: add missing DESTDIR to Makefile for udev rule - fix len in snprintf to silence compiler warning about potential overflow