SPECS: device-mapper.spec - klibc used instead of uClibc for dmset...

[jajcus]

Author: jajcus                       Date: Sun Jul 31 17:54:54 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- klibc used instead of uClibc for dmsetup-initrd compilation
- device-mapper-initrd-devel subpackage added

---- Files affected:
SPECS:
   device-mapper.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/device-mapper.spec
diff -u SPECS/device-mapper.spec:1.40 SPECS/device-mapper.spec:1.41
--- SPECS/device-mapper.spec:1.40	Sun Jul 31 17:12:40 2005
+++ SPECS/device-mapper.spec	Sun Jul 31 19:54:48 2005
@@ -3,11 +3,7 @@
 # Conditional build:
 %bcond_without	selinux		# build without SELinux support
 %bcond_without	initrd		# don't build initrd version
-%bcond_with	glibc		# build glibc-based initrd version
 #
-%ifnarch %{ix86}
-%define with_glibc 1
-%endif
 Summary:	Userspace support for the device-mapper
 Summary(pl):	Wsparcie dla mapowania urządzeń w przestrzeni użytkownika
 Name:		device-mapper
@@ -18,15 +14,15 @@
 Source0:	ftp://sources.redhat.com/pub/dm/%{name}.%{version}.tgz
 # Source0-md5:	10469034e2f1f1483fd3d80fb3883af2
 Patch0:		%{name}-stack.patch
+# http://www.redhat.com/archives/dm-devel/2005-March/msg00022.html
+Patch1:		%{name}-disable_dynamic_link.patch
+Patch2:		%{name}-klibc.patch
 URL:		http://sources.redhat.com/dm/
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.10}
 %{?with_selinux:Requires:	libselinux >= 1.10}
-%if %{with initrd}
-%{?with_glibc:BuildRequires:	glibc-static}
-%{?!with_glibc:BuildRequires:	uClibc-static}
-%endif
+%{?with_initrd:BuildRequires:	klibc}
 Conflicts:	dev < 2.9.0-8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -85,6 +81,21 @@
 %description static -l pl
 Statyczna biblioteka devmapper.
 
+%package initrd-devel
+Summary:	Static devmapper library and header files for initrd applications
+Summary(pl):	Statyczna biblioteka devmapper i jej pliki nagłówkowe dla aplikacji initrd
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	klibc
+
+%description initrd-devel
+Static devmapper library and its header files for initrd applications linked
+with klibc.
+
+%description initrd-devel -l pl
+Statyczna biblioteka devmapper oraz jej pliki nagłówkowe dla aplikacji
+używanych w initrd, zlinkowana z klibc.
+
 %package scripts
 Summary:	Additional scripts
 Summary(pl):	Dodatkowe skrypty
@@ -101,6 +112,8 @@
 %prep
 %setup -q -n %{name}.%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.sub autoconf
@@ -115,10 +128,13 @@
 	--with-group=%(id -g) \
 	--with-interface=ioctl \
 	--enable-static_link \
-	%{?!with_glibc:CC="%{_target_cpu}-uclibc-gcc"}
+	--disable-dynamic_link \
+	--enable-klibc \
+	CC="klcc"
 %{__make}
 
 cp -a dmsetup/dmsetup.static initrd-dmsetup
+cp -a lib/ioctl/libdevmapper.a initrd-libdevmapper.a
 %{__make} clean
 %endif
 
@@ -127,7 +143,8 @@
 	--with-optimisation="%{rpmcflags}" \
 	--with-user=%(id -u) \
 	--with-group=%(id -g) \
-	--with-interface=ioctl
+	--with-interface=ioctl \
+	--disable-klibc
 %{__make}
 
 ar cru libdevmapper.a lib/ioctl/*.o lib/*.o
@@ -135,7 +152,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{%{_lib},%{_libdir}/%{name}}
+install -d $RPM_BUILD_ROOT/{%{_lib},%{_libdir}/%{name},/usr/{%{_lib},include}/klibc}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -147,6 +164,8 @@
 
 install libdevmapper.a $RPM_BUILD_ROOT%{_libdir}
 %{?with_initrd:install initrd-dmsetup $RPM_BUILD_ROOT%{_sbindir}}
+%{?with_initrd:install initrd-libdevmapper.a $RPM_BUILD_ROOT/usr/%{_lib}/klibc/libdevmapper.a}
+%{?with_initrd:install include/libdevmapper.h $RPM_BUILD_ROOT/usr/include/klibc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -179,6 +198,11 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/initrd-dmsetup
 
+%files initrd-devel
+%defattr(644,root,root,755)
+/usr/%{_lib}/klibc/libdevmapper.a
+/usr/include/klibc/libdevmapper.h
+
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -186,6 +210,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2005/07/31 17:54:48  jajcus
+- klibc used instead of uClibc for dmsetup-initrd compilation
+- device-mapper-initrd-devel subpackage added
+
 Revision 1.40  2005/07/31 15:12:40  jajcus
 - Release: 2
 - initrd subpackage (statically linked, using uClibc on ix86 and without selinux support) added
================================================================

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