[udev: 2/2] Merge remote branch 'origin/f15/master'

[Harald Hoyer]

commit 3bc0c66b99890f79822de37e2334fb8b96c70163
Merge: b52809d cef7225
Author: Harald Hoyer <harald at redhat.com>
Date:   Fri Apr 8 10:05:50 2011 +0200

    Merge remote branch 'origin/f15/master'

 udev-167-selinux_label.patch |  208 ++++++++++++++++++++++++++++++++++++++++++
 udev.spec                    |    9 ++-
 2 files changed, 216 insertions(+), 1 deletions(-)
---
diff --cc udev.spec
index f963cff,f5117a2..a1bf568
--- a/udev.spec
+++ b/udev.spec
@@@ -113,11 -118,9 +116,12 @@@ glib-based applications using libudev f
  %prep 
  %setup -q 
  %patch3 -p1 -b .git3
+ %patch4 -p1 -b .label
  
  %build
 +# prevent man pages from re-building (xmlto)
 +find . -name "*.[1-8]" -exec touch '{}' \;
 +
  export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now"
  
  # prevent man pages from re-building (xmlto)