SPECS (LINUX_2_6_22): lvm2.spec - up to 2.02.39; fix selinux related build ...

[glen]

Author: glen                         Date: Sat Jul 19 13:40:25 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- up to 2.02.39; fix selinux related build problem by syncing options with device-mapper; disable readline for initrd

---- Files affected:
SPECS:
   lvm2.spec (1.95.2.3 -> 1.95.2.4) 

---- Diffs:

================================================================
Index: SPECS/lvm2.spec
diff -u SPECS/lvm2.spec:1.95.2.3 SPECS/lvm2.spec:1.95.2.4
--- SPECS/lvm2.spec:1.95.2.3	Fri Jul 18 19:40:07 2008
+++ SPECS/lvm2.spec	Sat Jul 19 15:40:19 2008
@@ -14,12 +14,12 @@
 Summary:	The new version of Logical Volume Manager for Linux
 Summary(pl.UTF-8):	Nowa wersja Logical Volume Managera dla Linuksa
 Name:		lvm2
-Version:	2.02.35
+Version:	2.02.39
 Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5:	0544fb7e791f78e3824653dbf4574c2e
+# Source0-md5:	32ad429461070f0813aff758e0988bc2
 Patch0:		%{name}-as-needed.patch
 Patch1:		%{name}-selinux.patch
 URL:		http://sources.redhat.com/lvm2/
@@ -48,6 +48,7 @@
 BuildRequires:	cman-devel >= 1.0
 BuildRequires:	dlm-devel >= 1.0-0.pre21.2
 %endif
+BuildRequires:	ncurses-devel
 BuildRequires:	readline-devel
 Requires:	device-mapper >= %{devmapper_ver}
 %if %{with clvmd}
@@ -106,8 +107,11 @@
 	--with-optimisation="-Os" \
 	--enable-static_link \
 	--with-lvm1=internal \
-	--disable-selinux \
+	--%{?with_uClibc:dis}%{!?with_uClibc:en}able-selinux \
+	--disable-readline \
 	--disable-nls
+# non uclibc version links with normal static libdevicemapper which has selinux enabled
+# and we need to keep these in sync between device-mapper and lvm2
 
 %{__sed} -i -e 's#rpl_malloc#malloc#g' lib/misc/configure.h
 
@@ -168,6 +172,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95.2.4  2008/07/19 13:40:19  glen
+- up to 2.02.39; fix selinux related build problem by syncing options with device-mapper; disable readline for initrd
+
 Revision 1.95.2.3  2008/07/18 17:40:07  glen
 - up to 2.02.35, known to be broken for 2.4 kernel :(
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lvm2.spec?r1=1.95.2.3&r2=1.95.2.4&f=u