- 1.02.07 needs make.tmpl change

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

diff --git a/device-mapper.spec b/device-mapper.spec
index 2741e5b7f41a90cd34dd3c404bfc37a9d4cbddde..463728ccd5827349a29b3b1eb70101bd2b5b6569 100644 (file)
--- a/device-mapper.spec
+++ b/device-mapper.spec
@@ -6,42 +6,42 @@
 Summary:       Userspace support for the device-mapper
 Summary(pl):   Wsparcie dla mapowania urz±dzeñ w przestrzeni u¿ytkownika
 Name:          device-mapper
-Version:       1.01.03
-Release:       2
-License:       GPL
+Version:       1.02.05
+Release:       0.4
+License:       GPL v2
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/dm/%{name}.%{version}.tgz
-# Source0-md5: 10469034e2f1f1483fd3d80fb3883af2
-Patch0:                %{name}-stack.patch
+# Source0-md5: e5cfc57a6e36af883dfedd9e9106f97e
 # http://www.redhat.com/archives/dm-devel/2005-March/msg00022.html
-Patch1:                %{name}-disable_dynamic_link.patch
-Patch2:                %{name}-klibc.patch
+Patch0:                %{name}-disable_dynamic_link.patch
+Patch1:                %{name}-klibc.patch
+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}
 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}
@@ -130,7 +134,8 @@ cp -f /usr/share/automake/config.sub autoconf
        --enable-static_link \
        --disable-dynamic_link \
        --enable-klibc \
-       CC="klcc"
+       CC="klcc -static"
+sed -i -e 's#-Dmalloc=rpl_malloc##g' make.tmpl
 %{__make}
 
 cp -a dmsetup/dmsetup.static initrd-dmsetup
@@ -140,16 +145,14 @@ cp -a lib/ioctl/libdevmapper.a initrd-libdevmapper.a
 
 %configure \
        --%{?with_selinux:en}%{!?with_selinux:dis}able-selinux \
-       --with-optimisation="%{rpmcflags}" \
+       --with-optimisation="%{rpmcflags} -DHAVE_GETOPTLONG" \
        --with-user=%(id -u) \
        --with-group=%(id -g) \
        --with-interface=ioctl \
+       --enable-dmeventd \
        --disable-klibc
 %{__make}
 
-ar cru libdevmapper.a lib/ioctl/*.o lib/*.o
-ranlib libdevmapper.a
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/{%{_lib},%{_libdir}/%{name},/usr/{%{_lib},include}/klibc}
@@ -157,12 +160,12 @@ install -d $RPM_BUILD_ROOT/{%{_lib},%{_libdir}/%{name},/usr/{%{_lib},include}/kl
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-SONAME=$(basename $(ls -1 $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*))
+SONAME=$(cd $RPM_BUILD_ROOT%{_libdir}; echo libdevmapper.so.*.*)
 ln -sf /%{_lib}/${SONAME} $RPM_BUILD_ROOT%{_libdir}/libdevmapper.so
 mv -f $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.* $RPM_BUILD_ROOT/%{_lib}
 install scripts/* $RPM_BUILD_ROOT/%{_libdir}/%{name}
 
-install libdevmapper.a $RPM_BUILD_ROOT%{_libdir}
+install lib/ioctl/libdevmapper.a $RPM_BUILD_ROOT%{_libdir}
 %{?with_initrd:install initrd-dmsetup $RPM_BUILD_ROOT%{_sbindir}}
 %{?with_initrd:install initrd-libdevmapper.a $RPM_BUILD_ROOT/usr/%{_lib}/klibc/libdevmapper.a}
 %{?with_initrd:install include/libdevmapper.h $RPM_BUILD_ROOT/usr/include/klibc}
@@ -194,11 +197,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*
 
+%if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/initrd-dmsetup
 
 %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