SPECS: device-mapper.spec - Release: 2 - initrd subpackage (static...

[jajcus]

Author: jajcus                       Date: Sun Jul 31 15:12:45 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Release: 2
- initrd subpackage (statically linked, using uClibc on ix86 and without selinux support) added
- without_selinux bcond fixed

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

---- Diffs:

================================================================
Index: SPECS/device-mapper.spec
diff -u SPECS/device-mapper.spec:1.39 SPECS/device-mapper.spec:1.40
--- SPECS/device-mapper.spec:1.39	Sat Jun 18 19:55:45 2005
+++ SPECS/device-mapper.spec	Sun Jul 31 17:12:40 2005
@@ -2,12 +2,17 @@
 #
 # 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
 Version:	1.01.03
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/dm/%{name}.%{version}.tgz
@@ -18,6 +23,10 @@
 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
 Conflicts:	dev < 2.9.0-8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,6 +48,19 @@
 przestrzeni użytkownika narzędzia do zarządzania logicznymi
 wolumenami.
 
+%package initrd
+Summary:	Userspace support for the device-mapper - static dmsetup for initrd
+Summary(pl):	Wsparcie dla mapowania urządzeń w przestrzeni użytkownika - statyczne dmsetup dla initrd
+Group:		Applications/System
+Requires:	%{name} = %{version}-%{release}
+
+%description initrd
+Userspace support for the device-mapper - static dmsetup binary for initrd.
+
+%description initrd -l pl
+Wsparcie dla mapowania urządzeń w przestrzeni użytkownika - statyczna wersja
+dmsetup dla initrd.
+
 %package devel
 Summary:	Header files and development documentation for %{name}
 Summary(pl):	Pliki nagłówkowe i dokumentacja do %{name}
@@ -84,8 +106,24 @@
 cp -f /usr/share/automake/config.sub autoconf
 %{__aclocal}
 %{__autoconf}
+
+%if %{with initrd}
 %configure \
-	SELINUX=%{?with_selinux:yes}%{!?with_selinux:no} \
+	--disable-selinux \
+	--with-optimisation="%{rpmcflags}" \
+	--with-user=%(id -u) \
+	--with-group=%(id -g) \
+	--with-interface=ioctl \
+	--enable-static_link \
+	%{?!with_glibc:CC="%{_target_cpu}-uclibc-gcc"}
+%{__make}
+
+cp -a dmsetup/dmsetup.static initrd-dmsetup
+%{__make} clean
+%endif
+
+%configure \
+	--%{?with_selinux:en}%{!?with_selinux:dis}able-selinux \
 	--with-optimisation="%{rpmcflags}" \
 	--with-user=%(id -u) \
 	--with-group=%(id -g) \
@@ -108,6 +146,7 @@
 install scripts/* $RPM_BUILD_ROOT/%{_libdir}/%{name}
 
 install libdevmapper.a $RPM_BUILD_ROOT%{_libdir}
+%{?with_initrd:install initrd-dmsetup $RPM_BUILD_ROOT%{_sbindir}}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -118,7 +157,7 @@
 %files
 %defattr(644,root,root,755)
 %doc INTRO INSTALL README scripts/*
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/dmsetup
 %attr(755,root,root) /%{_lib}/lib*.so.*.*
 %{_mandir}/man8/*
 
@@ -136,12 +175,22 @@
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*
 
+%files initrd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/initrd-dmsetup
+
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
+- without_selinux bcond fixed
+
 Revision 1.39  2005/06/18 17:55:45  areq
 - 1.01.03
 
================================================================

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