SPECS: device-mapper.spec - disable uclibc by default

[arekm]

Author: arekm                        Date: Sat Jun  2 21:30:04 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- disable uclibc by default

---- Files affected:
SPECS:
   device-mapper.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: SPECS/device-mapper.spec
diff -u SPECS/device-mapper.spec:1.78 SPECS/device-mapper.spec:1.79
--- SPECS/device-mapper.spec:1.78	Tue May  1 15:33:09 2007
+++ SPECS/device-mapper.spec	Sat Jun  2 23:29:59 2007
@@ -5,6 +5,7 @@
 # Conditional build:
 %bcond_without	selinux		# build without SELinux support
 %bcond_without	initrd		# don't build initrd version
+%bcond_with	uclibc
 #
 Summary:	Userspace support for the device-mapper
 Summary(pl.UTF-8):	Wsparcie dla mapowania urządzeń w przestrzeni użytkownika
@@ -27,7 +28,9 @@
 BuildRequires:	automake
 %{?with_initrd:BuildRequires:	klibc-static}
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.10}
-%{?with_initrd:BuildRequires:	uClibc-static >= 0.9.26}
+%if %{with initrd} && %{with uclibc}
+BuildRequires:	uClibc-static >= 0.9.26
+%endif
 # /usr/include/klibc/libdevmapper.h is included first before currently built version with klcc
 BuildConflicts:	device-mapper-initrd-devel < 1.02.17
 %{?with_selinux:Requires:	libselinux >= 1.10}
@@ -152,6 +155,7 @@
 cp -a lib/ioctl/libdevmapper.a initrd-libdevmapper-klibc.a
 %{__make} clean
 
+%if %{with uclibc}
 # uclibc (for lvm2)
 %configure \
 	CC="%{_target_cpu}-uclibc-gcc" \
@@ -167,6 +171,7 @@
 cp -a lib/ioctl/libdevmapper.a initrd-libdevmapper-uclibc.a
 %{__make} clean
 %endif
+%endif
 
 %configure \
 	CLDFLAGS="%{rpmldflags}" \
@@ -202,10 +207,12 @@
 install -d $RPM_BUILD_ROOT/usr/{{%{_lib},include}/klibc,%{_target_cpu}-linux-uclibc/usr/{lib,include}}
 install initrd-dmsetup $RPM_BUILD_ROOT%{_sbindir}
 install initrd-libdevmapper-klibc.a $RPM_BUILD_ROOT/usr/%{_lib}/klibc/libdevmapper.a
-install initrd-libdevmapper-uclibc.a $RPM_BUILD_ROOT/usr/%{_target_cpu}-linux-uclibc/usr/lib/libdevmapper.a
 install include/libdevmapper.h $RPM_BUILD_ROOT/usr/include/klibc
+%if %{with uclibc}
+install initrd-libdevmapper-uclibc.a $RPM_BUILD_ROOT/usr/%{_target_cpu}-linux-uclibc/usr/lib/libdevmapper.a
 install include/libdevmapper.h $RPM_BUILD_ROOT/usr/%{_target_cpu}-linux-uclibc/usr/include
 %endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -247,10 +254,12 @@
 %files initrd-devel
 %defattr(644,root,root,755)
 %{_prefix}/%{_lib}/klibc/libdevmapper.a
-%{_prefix}/%{_target_cpu}-linux-uclibc/usr/lib/libdevmapper.a
 %{_includedir}/klibc/libdevmapper.h
+%if %{with uclibc}
+%{_prefix}/%{_target_cpu}-linux-uclibc/usr/lib/libdevmapper.a
 %{_prefix}/%{_target_cpu}-linux-uclibc/usr/include/libdevmapper.h
 %endif
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -258,6 +267,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2007/06/02 21:29:59  arekm
+- disable uclibc by default
+
 Revision 1.78  2007/05/01 13:33:09  qboosh
 - updated to 1.02.19
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/device-mapper.spec?r1=1.78&r2=1.79&f=u