SPECS: cryptsetup.spec - Release: .7 - -initrd subpackage with sta...

[jajcus]

Author: jajcus                       Date: Sun Jul 31 18:16:25 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Release: .7
- -initrd subpackage with statically-linkeg cryptsetup

---- Files affected:
SPECS:
   cryptsetup.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/cryptsetup.spec
diff -u SPECS/cryptsetup.spec:1.12 SPECS/cryptsetup.spec:1.13
--- SPECS/cryptsetup.spec:1.12	Tue May  3 17:22:34 2005
+++ SPECS/cryptsetup.spec	Sun Jul 31 20:16:19 2005
@@ -1,10 +1,18 @@
 # $Revision$, $Date$
+#
+%bcond_without	initrd		# don't build cryptsetup-initrd
+#
+# TODO:
+#	- think about initrd version compiled with klibc. That would require
+#	klibc-compatible libgcrypt and popt that could lead us to a quite
+#	large klibc-compatible library chain.
+#
 Summary:	dm-crypt config tool for encypted filesystems
 Summary(pl):	Narzędzie konfiguracyjne do dm-crypt dla szyfrowanych systemów plików
 Name:		cryptsetup
 Version:	0.2
 %define	_rel	pre1
-Release:	1.%{_rel}.6
+Release:	1.%{_rel}.7
 License:	GPL
 Group:		Base
 Source0:	http://www.saout.de/misc/dm-crypt/%{name}-%{version}-%{_rel}.tar.bz2
@@ -15,6 +23,9 @@
 BuildRequires:	device-mapper-devel >= 1.01.01
 BuildRequires:	libgcrypt-devel >= 1.1.42
 BuildRequires:	popt-devel
+%{?with_initrd:BuildRequires:	device-mapper-static}
+%{?with_initrd:BuildRequires:	libgcrypt-static}
+%{?with_initrd:BuildRequires:	libgpg-error-static}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
@@ -52,6 +63,17 @@
 %description static -l pl
 Statyczna wersja biblioteki cryptsetup.
 
+%package initrd
+Summary:	Static cryptsetup utility for initrd
+Summary(pl):	Statyczne cryptsetup dla initrd
+Group:		Development/Libraries
+
+%description initrd
+Statically-linked version of cryptsetup utility for use in initrd.
+
+%description initrd -l pl
+Statycznie linkowana wersja narzędzia cryptsetup do użytku w initrd.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -61,7 +83,18 @@
 rm -f po/stamp-po
 
 %build
-%configure
+
+%if %{with initrd}
+%configure \
+	--disable-shared \
+	--disable-shared-lib \
+	LDFLAGS="-static %{rpmldflags}"
+%{__make}
+cp src/cryptsetup initrd-cryptsetup
+%{__make} clean
+%endif
+
+%configure 
 #	--enable-plugins - NFY
 %{__make}
 
@@ -75,6 +108,7 @@
 mv -f $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so.*.*.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo libcryptsetup.so.*.*.*) \
 	$RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so
+%{?with_initrd:install initrd-cryptsetup $RPM_BUILD_ROOT/%{_sbindir}}
 
 %find_lang %{name}
 
@@ -102,12 +136,22 @@
 %defattr(644,root,root,755)
 %{_libdir}/libcryptsetup.a
 
+%if %{with initrd}
+%files initrd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/initrd-cryptsetup
+%endif
+
 %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.13  2005/07/31 18:16:19  jajcus
+- Release: .7
+- -initrd subpackage with statically-linkeg cryptsetup
+
 Revision 1.12  2005/05/03 15:22:34  arekm
 BR new dm
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cryptsetup.spec?r1=1.12&r2=1.13&f=u