- Conflicts: geninitrd <= 10000.3 (geninitrd-10000.3 doesn't know _libdir/initrd)

[packages/dmraid.git] / dmraid.spec

diff --git a/dmraid.spec b/dmraid.spec
index d9bf62e588c030b7940ade841c8448cf42d52d3b..721883d17136359d3bc67f9da6a2afceb07b91bf 100644 (file)
--- a/dmraid.spec
+++ b/dmraid.spec
@@ -21,6 +21,7 @@ Patch1:               %{name}-fix.patch
 Patch2:                %{name}-optflags.patch
 Patch3:                %{name}-as-needed.patch
 Patch4:                %{name}-unsigned.patch
+Patch5:                %{name}-diet.patch
 URL:           http://people.redhat.com/~heinzm/sw/dmraid/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -90,6 +91,7 @@ ATARAID.
 Summary:       Device-mapper RAID tool - statically linked version
 Summary(pl.UTF-8):     Narzędzie do RAID-u opartego o device-mapper - wersja statyczna
 Group:         Base
+Conflicts:     geninitrd <= 10000.3
 
 %description initrd
 Statically linked version of dmraid utility.
@@ -118,6 +120,7 @@ mv */* ./
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.sub autoconf
@@ -126,18 +129,20 @@ cp -f /usr/share/automake/config.sub autoconf
 
 %if %{with initrd}
 %configure \
-       %{?with_dietlibc:CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -static"} \
-       %if %{with selinux} && %{with glibc}
-       --enable-libselinux \
-       --enable-libsepol \
-       %else
+       %if %{with dietlibc}
+       CC="diet %{__cc} -Os %{rpmldflags} -static" \
        --disable-libselinux \
        --disable-libsepol \
+       %else
+               %if %{with selinux}
+       --enable-libselinux \
+       --enable-libsepol \
+               %endif
        %endif
        --enable-static_link
 
 %{__make} -j1
-cp -f tools/dmraid{,-initrd}
+mv -f tools/dmraid dmraid-initrd
 %{__make} clean
 %endif
 
@@ -160,7 +165,8 @@ ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libdmraid.so.*.*.*) \
         $RPM_BUILD_ROOT%{_libdir}/libdmraid.so
 
 %if %{with initrd}
-install -D tools/dmraid-initrd $RPM_BUILD_ROOT/sbin/dmraid-initrd
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install dmraid-initrd $RPM_BUILD_ROOT%{_libdir}/initrd/dmraid
 %endif
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/initramfs-tools/hooks/dmraid
@@ -191,7 +197,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) /sbin/dmraid-initrd
+%attr(755,root,root) %{_libdir}/initrd/dmraid
 %endif
 
 %files initramfs