Author: glen                         Date: Sun Nov  9 23:22:25 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add -initrd subpackage; rel 4

---- Files affected:
SPECS:
   cryptsetup-luks.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SPECS/cryptsetup-luks.spec
diff -u SPECS/cryptsetup-luks.spec:1.26 SPECS/cryptsetup-luks.spec:1.27
--- SPECS/cryptsetup-luks.spec:1.26     Thu Apr  3 18:17:36 2008
+++ SPECS/cryptsetup-luks.spec  Mon Nov 10 00:22:20 2008
@@ -1,14 +1,14 @@
 # $Revision$, $Date$
 #
 # Conditonal build:
-%bcond_with    static  # link cryptsetup statically
+%bcond_without initrd  # don't build initrd version
 #
 %define        realname        cryptsetup
 Summary:       LUKS for dm-crypt implemented in cryptsetup
 Summary(pl.UTF-8):     LUKS dla dm-crypta zaimplementowany w cryptsetup
 Name:          cryptsetup-luks
 Version:       1.0.6
-Release:       3
+Release:       4
 License:       GPL v2
 Group:         Base
 Source0:       http://luks.endorphin.org/source/%{realname}-%{version}.tar.bz2
@@ -25,7 +25,7 @@
 BuildRequires: libtool
 BuildRequires: libuuid-devel
 BuildRequires: popt-devel
-%if %{with static}
+%if %{with initrd}
 BuildRequires: device-mapper-static >= 1.02.07
 BuildRequires: libgcrypt-static >= 1.1.42
 BuildRequires: libgpg-error-static
@@ -92,6 +92,14 @@
 %description static -l pl.UTF-8
 Statyczna wersja biblioteki cryptsetup.
 
+%package initrd
+Summary:       LUKS for dm-crypt implemented in cryptsetup - initrd version
+Group:         Base
+
+%description initrd
+This package contains implementation of LUKS for dm-crypt implemented
+in cryptsetup - staticaly linked for initrd.
+
 %prep
 %setup -q -n %{realname}-%{version}
 %patch1 -p1
@@ -103,9 +111,18 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+
+%if %{with initrd}
 %configure \
        --enable-static \
-       %{?with_static:--enable-static-cryptsetup}
+       --enable-static-cryptsetup
+%{__make}
+mv src/cryptsetup cryptsetup-initrd
+%{__make} clean
+%endif
+
+%configure \
+       --enable-static
 %{__make}
 
 %install
@@ -119,6 +136,10 @@
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcryptsetup.so.*.*.*) \
        $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so
 
+%if %{with initrd}
+install cryptsetup-initrd $RPM_BUILD_ROOT%{_sbindir}
+%endif
+
 %find_lang %{realname}
 
 %clean
@@ -145,13 +166,22 @@
 %defattr(644,root,root,755)
 %{_libdir}/libcryptsetup.a
 
+%if %{with initrd}
+%files initrd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/cryptsetup-initrd
+%endif
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[EMAIL PROTECTED]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.26  2008/04/03 16:17:36  glen
+Revision 1.27  2008/11/09 23:22:20  glen
+- add -initrd subpackage; rel 4
+
+Revision 1.26  2008-04-03 16:17:36  glen
 - release 3
 
 Revision 1.25  2008-03-19 23:50:03  qboosh
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cryptsetup-luks.spec?r1=1.26&r2=1.27&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to