X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cryptsetup.spec;h=1646a101fae625b0f85b90c562a35eeecd3ed293;hb=ecaa484daf8ac6521cb075f8e930c9ee94bc246b;hp=05fa292b6d411ecee6d7b7c9f358ff9de3824abc;hpb=d07d45f74b0225719c61ffcf51732aaff1e3aebb;p=packages%2Fcryptsetup.git

diff --git a/cryptsetup.spec b/cryptsetup.spec
index 05fa292..1646a10 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -7,12 +7,18 @@ 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:	4
+Release:	7
 License:	GPL v2
 Group:		Base
 Source0:	http://luks.endorphin.org/source/%{realname}-%{version}.tar.bz2
 # Source0-md5:	00d452eb7a76e39f5749545d48934a10
+Source1:	%{name}-initramfs-root-conf
+Source2:	%{name}-initramfs-root-hook
+Source3:	%{name}-initramfs-root-local-top
+Source4:	%{name}-initramfs-passdev-hook
+Source5:	%{name}-initramfs-README
 Patch1:		%{name}-nostatic.patch
+Patch2:		%{name}-udev.patch
 URL:		http://luks.endorphin.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -35,6 +41,8 @@ BuildRequires:	popt-static
 %endif
 Provides:	cryptsetup = %{version}
 Obsoletes:	cryptsetup
+Conflicts:	udev < 1:118-1
+Conflicts:	udev-core < 1:115
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
@@ -94,14 +102,33 @@ Statyczna wersja biblioteki cryptsetup.
 %package initrd
 Summary:	LUKS for dm-crypt implemented in cryptsetup - initrd version
 Group:		Base
+Requires:	udev-initrd >= 1:115
 
 %description initrd
 This package contains implementation of LUKS for dm-crypt implemented
 in cryptsetup - staticaly linked for initrd.
 
+%package initramfs
+Summary:	LUKS for dm-crypt implemented in cryptsetup - support scripts for initramfs-tools
+Summary(pl.UTF-8):	LUKS dla dm-crypta zaimplementowany w cryptsetup - skrypty dla initramfs-tools
+Group:		Base
+Requires:	%{name} = %{version}-%{release}
+Requires:	initramfs-tools
+
+%description initramfs
+LUKS for dm-crypt implemented in cryptsetup - support scripts
+for initramfs-tools.
+
+%description initramfs -l pl.UTF-8
+LUKS dla dm-crypta zaimplementowany w cryptsetup - skrypty dla
+initramfs-tools.
+
 %prep
 %setup -q -n %{realname}-%{version}
 %patch1 -p1
+%patch2 -p1
+
+install %{SOURCE5} README.initramfs
 
 %build
 %{__gettextize}
@@ -113,8 +140,10 @@ in cryptsetup - staticaly linked for initrd.
 
 %if %{with initrd}
 %configure \
+	--disable-shared-library \
 	--enable-static \
-	--enable-static-cryptsetup
+	--enable-static-cryptsetup \
+	--disable-nls
 %{__make}
 mv src/cryptsetup cryptsetup-initrd
 %{__make} clean
@@ -126,6 +155,7 @@ mv src/cryptsetup cryptsetup-initrd
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/{conf-hooks.d,hooks,scripts/local-top}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -139,6 +169,11 @@ ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcryptsetup.so.*.*.*) \
 install cryptsetup-initrd $RPM_BUILD_ROOT%{_sbindir}
 %endif
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/conf-hooks.d/cryptsetup
+install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/cryptroot
+install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/scripts/local-top/cryptroot
+install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/cryptpassdev
+
 %find_lang %{realname}
 
 %clean
@@ -170,3 +205,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/cryptsetup-initrd
 %endif
+
+%files initramfs
+%defattr(644,root,root,755)
+%doc README.initramfs
+%attr(755,root,root) %{_datadir}/initramfs-tools/conf-hooks.d/cryptsetup
+%attr(755,root,root) %{_datadir}/initramfs-tools/hooks/cryptroot
+%attr(755,root,root) %{_datadir}/initramfs-tools/hooks/cryptpassdev
+%attr(755,root,root) %{_datadir}/initramfs-tools/scripts/local-top/cryptroot