From 21f912004613ab41436b36b424f943f3c5bfbf83 Mon Sep 17 00:00:00 2001
From: Greg Frost <gregfrost1@bigpond.com>
Date: Sat, 4 Jul 2009 08:52:55 +0930
Subject: udev&mdadm: resolve conflict

---
 abs/core-testing/mdadm/PKGBUILD | 3 ++-
 abs/core-testing/udev/PKGBUILD  | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/abs/core-testing/mdadm/PKGBUILD b/abs/core-testing/mdadm/PKGBUILD
index 7745ad9..0af45bf 100644
--- a/abs/core-testing/mdadm/PKGBUILD
+++ b/abs/core-testing/mdadm/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
 pkgver=3.0
-pkgrel=11
+pkgrel=12
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -10,6 +10,7 @@ url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/"
 groups=('base')
 depends=('glibc')
 backup=('etc/mdadm.conf')
+conflicts=('udev<135-4')
 source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/$pkgname-$pkgver.tar.bz2 \
         mdadm mdadm.conf raid-partitions_install raid-partitions_hook)
 replaces=('raidtools')
diff --git a/abs/core-testing/udev/PKGBUILD b/abs/core-testing/udev/PKGBUILD
index 15c514c..18b1763 100644
--- a/abs/core-testing/udev/PKGBUILD
+++ b/abs/core-testing/udev/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=udev
 pkgver=135
-pkgrel=3
+pkgrel=4
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -75,6 +75,9 @@ build() {
   cd $pkgdir/lib/udev/rules.d/
   patch -Np1 -i $srcdir/arch-udev-rules.patch || return 1
 
+  # remove the md-raid rules which are now provided by the mdadm package
+  rm -f $pkgdir/lib/udev/rules.d/64-md-raid.rules
+
   # disable persistent cdromsymlinks and network by default 
   # and move it to /etc/udev/rules.d
   mv $pkgdir/lib/udev/rules.d/75-persistent-net-generator.rules \
-- 
cgit v0.12

