- rel 10

[packages/cryptsetup-luks.git] / cryptsetup-luks.spec

diff --git a/cryptsetup-luks.spec b/cryptsetup-luks.spec
index c3e4300ee684962f3ec80c744b53f6e0ac1b1175..4a779a254e5ada465d91452604bfcf4e08b6c49c 100644 (file)
--- a/cryptsetup-luks.spec
+++ b/cryptsetup-luks.spec
@@ -8,7 +8,7 @@ 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:       9
+Release:       10
 License:       GPL v2
 Group:         Base
 Source0:       http://luks.endorphin.org/source/%{realname}-%{version}.tar.bz2
@@ -112,6 +112,7 @@ Statyczna wersja biblioteki cryptsetup.
 Summary:       LUKS for dm-crypt implemented in cryptsetup - initrd version
 Group:         Base
 Requires:      udev-initrd >= 1:115
+Conflicts:     geninitrd < 10000.10
 
 %description initrd
 This package contains implementation of LUKS for dm-crypt implemented
@@ -151,7 +152,7 @@ install %{SOURCE5} README.initramfs
 %if %{with initrd}
 %configure \
 %if %{with dietlibc}
-       CC="diet %{__cc} -Os %{rpmldflags}" \
+       CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os" \
        ac_cv_lib_popt_poptConfigFileToString=yes \
        ac_cv_lib_sepol_sepol_bool_set=no \
        ac_cv_lib_selinux_is_selinux_enabled=no \
@@ -167,8 +168,9 @@ install %{SOURCE5} README.initramfs
 %if %{with dietlibc}
 # we have to do it by hand cause libtool "know better" and forces
 # static libs from /usr/lib
-diet %{__cc} -Os -I./lib -static -o cryptsetup-initrd src/cryptsetup.c \
-       ./lib/.libs/libcryptsetup.a -lpopt -lgcrypt -lgpg-error -ldevmapper -luuid -lcompat
+diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -I./lib -static \
+       -o cryptsetup-initrd src/cryptsetup.c ./lib/.libs/libcryptsetup.a \
+       -lpopt -lgcrypt -lgpg-error -ldevmapper -luuid -lcompat
 %else
 %{__make} -C src
 mv src/cryptsetup cryptsetup-initrd
@@ -194,7 +196,8 @@ 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}
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install cryptsetup-initrd $RPM_BUILD_ROOT%{_libdir}/initrd/cryptsetup
 %endif
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/conf-hooks.d/cryptsetup
@@ -231,7 +234,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/cryptsetup-initrd
+%attr(755,root,root) %{_libdir}/initrd/cryptsetup
 %endif
 
 %files initramfs