- disable configure_cache as configure is ran twice with different CFLAGS

[packages/device-mapper.git] / device-mapper.spec

diff --git a/device-mapper.spec b/device-mapper.spec
index a37960f4272c714d43099313b18c6dfb1973665a..45af22946ecbcf98c1aec0bcc983d223a3dfd6a1 100644 (file)
--- a/device-mapper.spec
+++ b/device-mapper.spec
@@ -19,29 +19,29 @@ Patch2:             %{name}-getopt.patch
 URL:           http://sources.redhat.com/dm/
 BuildRequires: autoconf
 BuildRequires: automake
+%{?with_initrd:BuildRequires:  klibc-static}
 %{?with_selinux:BuildRequires: libselinux-devel >= 1.10}
 %{?with_selinux:Requires:      libselinux >= 1.10}
-%{?with_initrd:BuildRequires:  klibc-static}
 Conflicts:     dev < 2.9.0-8
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%undefine      configure_cache
 %define                _sbindir        /sbin
 
 %description
-The goal of this driver is to support volume management.
-The driver enables the definition of new block devices composed of
-ranges of sectors of existing devices. This can be used to define
-disk partitions - or logical volumes. This light-weight kernel
-component can support user-space tools for logical volume management.
+The goal of this driver is to support volume management. The driver
+enables the definition of new block devices composed of ranges of
+sectors of existing devices. This can be used to define disk
+partitions - or logical volumes. This light-weight kernel component
+can support user-space tools for logical volume management.
 
 %description -l pl
-Celem tego sterownika jest obs³uga zarz±dzania wolumenami.
-Sterownik w³±cza definiowanie nowych urz±dzeñ blokowych z³o¿onych z
-przedzia³ów sektorów na istniej±cych urz±dzeniach. Mo¿e to byæ
-wykorzystane do definiowania partycji na dysku lub logicznych
-wolumenów. Ten lekki sk³adnik j±dra mo¿e wspieraæ dzia³aj±ce w
-przestrzeni u¿ytkownika narzêdzia do zarz±dzania logicznymi
-wolumenami.
+Celem tego sterownika jest obs³uga zarz±dzania wolumenami. Sterownik
+w³±cza definiowanie nowych urz±dzeñ blokowych z³o¿onych z przedzia³ów
+sektorów na istniej±cych urz±dzeniach. Mo¿e to byæ wykorzystane do
+definiowania partycji na dysku lub logicznych wolumenów. Ten lekki
+sk³adnik j±dra mo¿e wspieraæ dzia³aj±ce w przestrzeni u¿ytkownika
+narzêdzia do zarz±dzania logicznymi wolumenami.
 
 %package initrd
 Summary:       Userspace support for the device-mapper - static dmsetup for initrd
@@ -115,6 +115,10 @@ Dodatkowe skrypty.
 %patch1 -p1
 %patch2 -p1
 
+# klcc puts its own -I before any options, so klibc's <linux/*>
+# overrides include/linux/*, requiring very fresh kernel headers
+sed -i -e 's,<linux/dm-ioctl.h>,"../../kernel/ioctl/dm-ioctl.h",' lib/ioctl/libdm-iface.c
+
 %build
 cp -f /usr/share/automake/config.sub autoconf
 %{__aclocal}
@@ -131,6 +135,7 @@ cp -f /usr/share/automake/config.sub autoconf
        --disable-dynamic_link \
        --enable-klibc \
        CC="klcc -static"
+sed -i -e 's#-Dmalloc=rpl_malloc##g' make.tmpl
 %{__make}
 
 cp -a dmsetup/dmsetup.static initrd-dmsetup
@@ -144,6 +149,7 @@ cp -a lib/ioctl/libdevmapper.a initrd-libdevmapper.a
        --with-user=%(id -u) \
        --with-group=%(id -g) \
        --with-interface=ioctl \
+       --enable-dmeventd \
        --disable-klibc
 %{__make}
 
@@ -201,6 +207,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files initrd-devel
 %defattr(644,root,root,755)
-/usr/%{_lib}/klibc/libdevmapper.a
-/usr/include/klibc/libdevmapper.h
+%{_prefix}/%{_lib}/klibc/libdevmapper.a
+%{_includedir}/klibc/libdevmapper.h
 %endif