SPECS: lvm2.spec - build with system device-mapper

[glen]

Author: glen                         Date: Sun May 21 17:03:04 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build with system device-mapper

---- Files affected:
SPECS:
   lvm2.spec (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: SPECS/lvm2.spec
diff -u SPECS/lvm2.spec:1.64 SPECS/lvm2.spec:1.65
--- SPECS/lvm2.spec:1.64	Sat May 20 14:27:10 2006
+++ SPECS/lvm2.spec	Sun May 21 19:02:59 2006
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO
-# - use system dm
 # - lvdisplay segfaults for me (somewhere in dm lib)
 #
 # Conditional build:
@@ -18,13 +17,11 @@
 Summary(pl):	Nowa wersja Logical Volume Managera dla Linuksa
 Name:		lvm2
 Version:	2.02.06
-Release:	0.1
+Release:	0.2
 License:	GPL
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
 # Source0-md5:	35c232e771812700e0ca7225da1431b8
-Source1:	ftp://sources.redhat.com/pub/dm/device-mapper.%{devmapper_ver}.tgz
-# Source1-md5:	460cc211b03af4048ec90c0de2ecd8f7
 URL:		http://sources.redhat.com/lvm2/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -32,6 +29,8 @@
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.10}
 BuildRequires:	rpmbuild(macros) >= 1.213
 %if %{with initrd}
+%{?with_uClibc:BuildRequires:	device-mapper-initrd-devel >= 1.02.07-0.15}
+%{!?with_uClibc:BuildRequires:	device-mapper-static}
 %{!?with_uClibc:BuildRequires:	glibc-static}
 %{?with_uClibc:BuildRequires:	uClibc-static >= 0.9.26}
 %endif
@@ -75,7 +74,7 @@
 potrzeby initrd.
 
 %prep
-%setup -q -n LVM2.%{version} -a1
+%setup -q -n LVM2.%{version}
 
 %build
 cp -f /usr/share/automake/config.sub autoconf
@@ -83,26 +82,8 @@
 %{__autoconf}
 
 %if %{with initrd}
-dm=$(ls -1d device-mapper*)
-cd $dm
-# no selinux for initrd
-sed -i -e 's#AC_CHECK_LIB(selinux.*##g' configure.in
-cp -f /usr/share/automake/config.sub autoconf
-%{__aclocal}
-%{__autoconf}
 %configure \
 	%{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
-	--with-optimisation="-Os" \
-	--with-interface=ioctl \
-	--disable-nls
-sed -i -e 's#rpl_malloc#malloc#g' include/configure.h
-CFLAGS= \
-%{__make}
-cp lib/ioctl/libdevmapper.a .
-cd ..
-%configure \
-	CFLAGS="-I$(pwd)/${dm}/include -DINITRD_WRAPPER=1" \
-	%{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
 	ac_cv_lib_dl_dlopen=no \
 	--with-optimisation="-Os" \
 	--enable-static_link \
@@ -110,8 +91,8 @@
 	--disable-selinux \
 	--disable-nls
 sed -i -e 's#rpl_malloc#malloc#g' lib/misc/configure.h
-%{__make} \
-	LDFLAGS+="-L$(pwd)/${dm} -L$(pwd)/lib"
+
+%{__make}
 mv -f tools/lvm.static initrd-lvm
 %{__make} clean
 %endif
@@ -166,13 +147,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2006/05/21 17:02:59  glen
+- build with system device-mapper
+
 Revision 1.64  2006/05/20 12:27:10  glen
 - warning: unusable
 
 Revision 1.63  2006/05/20 02:22:04  glen
 - update to 2.02.06
 - use built libdevmapper.a instead of assembling partial one
-- default clvmd (if unspecified) used is cman, force gulm as it was here, but it fails bulding; disabled bcond
+- default clvmd (if unspecified) used is cman, force gulm as it was
+  here, but it fails bulding; disabled bcond
 - dm updated to 1.02.07
 
 Revision 1.62  2005/10/19 16:16:16  arekm
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/lvm2.spec?r1=1.64&r2=1.65&f=u