X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=device-mapper.spec;h=b3a439d15066b2f81b3196988d738b9902c836bb;hb=a01b84a1e75539b41bcd0b95df01dfed25779b1b;hp=b5b932e134548f3ffc53b010fa503107098d69e1;hpb=75d74553a2735f1a6b5c46f637da79d0667f589f;p=packages%2Fdevice-mapper.git

diff --git a/device-mapper.spec b/device-mapper.spec
index b5b932e..b3a439d 100644
--- a/device-mapper.spec
+++ b/device-mapper.spec
@@ -4,16 +4,17 @@
 # Conditional build:
 %bcond_without	selinux		# build without SELinux support
 %bcond_without	initrd		# don't build initrd version
+%bcond_without	uclibc
 #
 Summary:	Userspace support for the device-mapper
 Summary(pl.UTF-8):	Wsparcie dla mapowania urządzeń w przestrzeni użytkownika
 Name:		device-mapper
-Version:	1.02.18
-Release:	2
+Version:	1.02.20
+Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/dm/%{name}.%{version}.tgz
-# Source0-md5:	8ccb87923a9f33580205e5a9b39c8d58
+# Source0-md5:	6b8f350ca385e2afafd1fb98f1a15e10
 # http://www.redhat.com/archives/dm-devel/2005-March/msg00022.html
 Patch0:		%{name}-disable_dynamic_link.patch
 Patch1:		%{name}-klibc.patch
@@ -26,7 +27,9 @@ BuildRequires:	autoconf
 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}
@@ -151,6 +154,7 @@ cp -a dmsetup/dmsetup.static initrd-dmsetup
 cp -a lib/ioctl/libdevmapper.a initrd-libdevmapper-klibc.a
 %{__make} clean
 
+%if %{with uclibc}
 # uclibc (for lvm2)
 %configure \
 	CC="%{_target_cpu}-uclibc-gcc" \
@@ -166,6 +170,7 @@ sed -i -e 's#rpl_malloc#malloc#g' include/configure.h
 cp -a lib/ioctl/libdevmapper.a initrd-libdevmapper-uclibc.a
 %{__make} clean
 %endif
+%endif
 
 %configure \
 	CLDFLAGS="%{rpmldflags}" \
@@ -201,10 +206,12 @@ install dmeventd/libdevmapper-event.a $RPM_BUILD_ROOT%{_libdir}
 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
@@ -246,7 +253,9 @@ rm -rf $RPM_BUILD_ROOT
 %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