SPECS: device-mapper.spec - really build with uclibc - copy correc...

[glen]

Author: glen                         Date: Sun May 21 15:23:28 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- really build with uclibc
- copy correct configure args

---- Files affected:
SPECS:
   device-mapper.spec (1.56 -> 1.57) 

---- Diffs:

================================================================
Index: SPECS/device-mapper.spec
diff -u SPECS/device-mapper.spec:1.56 SPECS/device-mapper.spec:1.57
--- SPECS/device-mapper.spec:1.56	Sun May 21 16:26:55 2006
+++ SPECS/device-mapper.spec	Sun May 21 17:23:22 2006
@@ -8,7 +8,7 @@
 Summary(pl):	Wsparcie dla mapowania urządzeń w przestrzeni użytkownika
 Name:		device-mapper
 Version:	1.02.07
-Release:	0.8
+Release:	0.15
 License:	GPL v2
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/dm/%{name}.%{version}.tgz
@@ -147,12 +147,11 @@
 
 # uclibc (for lvm2)
 %configure \
-	%{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
-	ac_cv_lib_dl_dlopen=no \
-	--with-optimisation="-Os" \
-	--enable-static_link \
-	--with-lvm1=internal \
+	CC="%{_target_cpu}-uclibc-gcc" \
 	--disable-selinux \
+	--disable-dynamic_link \
+	--with-optimisation="-Os" \
+	--with-interface=ioctl \
 	--disable-nls
 sed -i -e 's#rpl_malloc#malloc#g' include/configure.h
 %{__make}
@@ -189,10 +188,10 @@
 install dmeventd/libdevmapper-event.a $RPM_BUILD_ROOT%{_libdir}
 
 %if %{with initrd}
-install -d $RPM_BUILD_ROOT/usr/{{%{_lib},include}/klibc,%{_target_cpu}-linux-uclibc/{lib,usr/include}}
+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/%{_lib}/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
 install include/libdevmapper.h $RPM_BUILD_ROOT/usr/%{_target_cpu}-linux-uclibc/usr/include
 %endif
@@ -235,7 +234,7 @@
 %files initrd-devel
 %defattr(644,root,root,755)
 %{_prefix}/%{_lib}/klibc/libdevmapper.a
-%{_prefix}/%{_target_cpu}-linux-uclibc/lib
+%{_prefix}/%{_target_cpu}-linux-uclibc/usr/%{_lib}/libdevmapper.a
 %{_includedir}/klibc/libdevmapper.h
 %{_prefix}/%{_target_cpu}-linux-uclibc/usr/include/libdevmapper.h
 %endif
@@ -246,6 +245,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2006/05/21 15:23:22  glen
+- really build with uclibc
+- copy correct configure args
+
 Revision 1.56  2006/05/21 14:26:55  glen
 - build also uclibc version of initrd-devel (for lvm2)
 
@@ -317,7 +320,7 @@
 
 Revision 1.36  2005/05/21 18:18:12  speedy
 - release 2
-- make scripts %%doc (kill dep on perl-base, scripts are optional...
+- make scripts %doc (kill dep on perl-base, scripts are optional...
   not required by /sbin/dmsetup)
 
 Revision 1.35  2005/05/21 15:18:15  qboosh
@@ -333,7 +336,7 @@
 - added selinux bcond; rel 2; STBR
 
 Revision 1.31  2004/11/17 20:46:05  pluto
-- %%install fixed.
+- %install fixed.
 
 Revision 1.30  2004/07/03 20:21:51  arekm
 - updated to 1.00.19; opt patch obsolete
================================================================

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