Author: glen Date: Wed Oct 31 17:58:00 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - --enable-debug for debug - add selinux.patch for static glibc linkage
---- Files affected: SPECS: lvm2.spec (1.93 -> 1.94) ---- Diffs: ================================================================ Index: SPECS/lvm2.spec diff -u SPECS/lvm2.spec:1.93 SPECS/lvm2.spec:1.94 --- SPECS/lvm2.spec:1.93 Mon Sep 10 01:16:13 2007 +++ SPECS/lvm2.spec Wed Oct 31 18:57:54 2007 @@ -3,7 +3,7 @@ # Conditional build: %bcond_without initrd # don't build initrd version %bcond_without uClibc # link initrd version with static glibc instead of uClibc -%bcond_without clvmd # build clvmd +%bcond_with clvmd # build clvmd %bcond_without selinux # disable SELinux # %ifarch sparc64 sparc @@ -15,12 +15,13 @@ Summary(pl.UTF-8): Nowa wersja Logical Volume Managera dla Linuksa Name: lvm2 Version: 2.02.28 -Release: 1 +Release: 1.14 License: GPL v2 Group: Applications/System Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz # Source0-md5: 940a882a71cae84f6befc8069a260ad1 Patch0: %{name}-as-needed.patch +Patch1: %{name}-selinux.patch URL: http://sources.redhat.com/lvm2/ BuildRequires: autoconf BuildRequires: automake @@ -37,12 +38,13 @@ %endif %else BuildRequires: device-mapper-static >= %{devmapper_ver} +%{?with_selinux:BuildRequires: libsepol-static} BuildRequires: glibc-static %endif %endif %if %{with clvmd} -BuildRequires: dlm-devel >= 1.0-0.pre21.2 BuildRequires: cman-devel >= 1.0 +BuildRequires: dlm-devel >= 1.0-0.pre21.2 %endif BuildRequires: readline-devel Requires: device-mapper >= %{devmapper_ver} @@ -86,6 +88,7 @@ %prep %setup -q -n LVM2.%{version} %patch0 -p1 +%{?with_selinux:%patch1 -p1} %build cp -f /usr/share/automake/config.sub autoconf @@ -96,12 +99,14 @@ %configure \ %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \ ac_cv_lib_dl_dlopen=no \ + %{?debug:--enable-debug} \ --with-optimisation="-Os" \ --enable-static_link \ --with-lvm1=internal \ --disable-selinux \ --disable-nls -sed -i -e 's#rpl_malloc#malloc#g' lib/misc/configure.h + +%{__sed} -i -e 's#rpl_malloc#malloc#g' lib/misc/configure.h %{__make} mv -f tools/lvm.static initrd-lvm @@ -110,6 +115,7 @@ %configure \ CFLAGS="%{rpmcflags}" \ + %{?debug:--enable-debug} \ --with-optimisation="" \ --enable-readline \ --enable-fsadm \ @@ -159,6 +165,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.94 2007/10/31 17:57:54 glen +- --enable-debug for debug +- add selinux.patch for static glibc linkage + Revision 1.93 2007/09/09 23:16:13 qboosh - updated to 2.02.28 - updated as-needed patch, removed obsolete susv3 patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lvm2.spec?r1=1.93&r2=1.94&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
