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

diff --git a/cryptsetup.spec b/cryptsetup.spec
index e6466dc..1646a10 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -1,18 +1,25 @@
 #
 # 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.4
-Release:	1
-License:	GPL
+Version:	1.0.6
+Release:	7
+License:	GPL v2
 Group:		Base
-Source0:	http://luks.endorphin.org/source/%{name}-%{version}.tar.bz2
-# Source0-md5:	156ae6b618438ee9feeddc6c2bdc4e94
+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
-URL:		http://luks.endorphin.org/about
+Patch2:		%{name}-udev.patch
+URL:		http://luks.endorphin.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	device-mapper-devel
@@ -20,10 +27,10 @@ BuildRequires:	gettext-devel
 BuildRequires:	libgcrypt-devel >= 1.1.42
 BuildRequires:	libselinux-devel
 BuildRequires:	libsepol-devel
+BuildRequires:	libtool
 BuildRequires:	libuuid-devel
 BuildRequires:	popt-devel
-BuildRequires:	libtool
-%if %{with static}
+%if %{with initrd}
 BuildRequires:	device-mapper-static >= 1.02.07
 BuildRequires:	libgcrypt-static >= 1.1.42
 BuildRequires:	libgpg-error-static
@@ -32,10 +39,14 @@ BuildRequires:	libsepol-static
 BuildRequires:	libuuid-static
 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
+%define		_noautoreqdep	libcryptsetup.so.0
 
 %description
 LUKS is the upcoming standard for Linux hard disk encryption. By
@@ -88,33 +99,82 @@ Static version of cryptsetup library.
 %description static -l pl.UTF-8
 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
+%setup -q -n %{realname}-%{version}
 %patch1 -p1
+%patch2 -p1
+
+install %{SOURCE5} README.initramfs
 
 %build
 %{__gettextize}
-%{__autoheader}
+%{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
+
+%if %{with initrd}
 %configure \
+	--disable-shared-library \
 	--enable-static \
-	%{?with_static:--enable-static-cryptsetup}
+	--enable-static-cryptsetup \
+	--disable-nls
+%{__make}
+mv src/cryptsetup cryptsetup-initrd
+%{__make} clean
+%endif
+
+%configure \
+	--enable-static
 %{__make}
 
 %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
 
 install -d $RPM_BUILD_ROOT/%{_lib}
-mv -f $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so.*.*.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo libcryptsetup.so.*.*.*) \
+mv -f $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcryptsetup.so.*.*.*) \
 	$RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so
 
-%find_lang %{name}
+%if %{with initrd}
+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
 rm -rf $RPM_BUILD_ROOT
@@ -122,19 +182,34 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files -f %{realname}.lang
 %defattr(644,root,root,755)
-%doc ChangeLog
+%doc AUTHORS ChangeLog TODO
 %attr(755,root,root) %{_sbindir}/cryptsetup
 %attr(755,root,root) /%{_lib}/libcryptsetup.so.*.*.*
-%{_mandir}/man8/*
+%attr(755,root,root) %ghost /%{_lib}/libcryptsetup.so.0
+%{_mandir}/man8/cryptsetup.8*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcryptsetup.so
 %{_libdir}/libcryptsetup.la
-%{_includedir}/*.h
+%{_includedir}/libcryptsetup.h
 
 %files static
 %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
+
+%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