- build without dietlibc (devmapper doesn't build properly with it, so deps unfulfilled)

- drag more libs, devmapper really needs libudev

Changed files:
    dmraid-as-needed.patch -> 1.4
    dmraid.spec -> 1.51

diff --git a/dmraid-as-needed.patch b/dmraid-as-needed.patch
index 688ba6a6cf4e245c3ae9a4d507c5281bc9daca94..720131f4a9f9d92b12dbcb0494df54c47d62c8b4 100644 (file)
--- a/dmraid-as-needed.patch
+++ b/dmraid-as-needed.patch
@@ -10,7 +10,7 @@
 +      ifeq ("@DIETLIBC@", "yes")
 +              DMRAIDLIBS += -ldevmapper_dietc
 +      else
-+              DMRAIDLIBS += -ldevmapper -lz
++              DMRAIDLIBS += -ldevmapper -lz -ludev -lrt
 +      endif
 +
 +#     ifeq ("@LIBSELINUX@", "yes")
@@ -36,3 +36,14 @@
  
  $(LIB_STATIC): $(OBJECTS)
        $(RM) $@
+--- dmraid/tools/Makefile.in~  2012-04-28 19:52:38.890744695 +0200
++++ dmraid/tools/Makefile.in   2012-04-28 21:10:18.659323226 +0200
+@@ -30,7 +30,7 @@
+       ifeq ("@DIETLIBC@", "yes")
+               DMRAIDLIBS += -ldevmapper_dietc
+       else
+-              DMRAIDLIBS += -ldevmapper
++              DMRAIDLIBS += -ldevmapper -ludev -lrt
+       endif
+ 
+       ifeq ("@LIBSELINUX@", "yes")

diff --git a/dmraid.spec b/dmraid.spec
index 6b18d535fabce1d56aef0fd1c4e7a31ed8ab87a4..c01df4ec60afbfce7dc5b03a5c359024984226c7 100644 (file)
--- a/dmraid.spec
+++ b/dmraid.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 %bcond_without initrd          # without initrd version
-%bcond_without dietlibc        # build initrd version with static glibc instead of dietlibc
+%bcond_with    dietlibc        # build initrd version with static glibc instead of dietlibc
 %bcond_without selinux         # build without SELinux support (needs selinux-disabled device-mapper)
 #
 Summary:       Device-mapper RAID tool
@@ -32,6 +32,7 @@ BuildRequires:        dietlibc-static >= 2:0.31-5
        %else
 BuildRequires: device-mapper-static >= 1.02.05-0.4
 BuildRequires: glibc-static
+BuildRequires: udev-static
 %if %{with selinux}
 BuildRequires: libselinux-static
 BuildRequires: libsepol-static