# _without_dist_kernel without kernel form ditribution
%define _kernel_ver %(grep UTS_RELEASE %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | cut -d'"' -f2)
-%define _kernel_ver_str %(echo %{_kernel_ver} | sed s/-/_/g)
+%define _kernel_ver_str %(echo %{_kernel_ver} | sed s/-/_/g)
%define _kernel24 %(echo %{_kernel_ver} | grep -q '2\.[012]\.' ; echo $?)
-%define rel 1
-
Summary: drbd is a block device designed to build high availibility clusters
Summary(pl): drbd jest urz±dzeniem blokowym dla klastrów o wysokiej niezawodno¶ci
Name: drbd
-Version: 0.5.8
+Version: 0.5.8.1
+%define rel 2
Release: %{rel}
License: GPL
Group: Base/Kernel
Source0: http://www.complang.tuwien.ac.at/reisner/drbd/download/%{name}-%{version}.tar.gz
Patch0: %{name}-kernel24.patch
URL: http://www.complang.tuwien.ac.at/reisner/drbd/
+%{!?_without_dist_kernel:BuildRequires: kernel-headers >= 2.2.20}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
%endif
%build
-%if %{_kernel24}
+
+# SMP begin
%{__make} \
%ifarch %{ix86}
KAF_i386="%{rpmcflags} -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer" \
DEBUGFLAGS="%{rpmcflags} %{?debug:-DDBG}"
mv drbd/drbd.o drbd-smp.o
-%endif
+# SMP end
+# UP begin
%{__make} \
%ifarch %{ix86}
KAF_i386="%{rpmcflags} -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer" \
KERNVER="%{_kernel_ver}" \
INCLUDE="-I%{_kernelsrcdir}/include" \
DEBUGFLAGS="%{rpmcflags} %{?debug:-DDBG}"
+# SMP end
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},%{_sysconfdir}} \
$RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/ha.d/resource.d}
-%if %{_kernel24}
+%if 0
install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
install drbd/drbd.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/drbd.o
install drbd-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/drbd.o
%else
install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/block
install drbd/drbd.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/block
-%if 0
-install drbd-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/block/drbd.o
-%endif
+install drbd-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/block/drbd.o
%endif
install user/drbdsetup $RPM_BUILD_ROOT%{_sbindir}
%defattr(644,root,root,755)
%doc *.gz
%if %{_kernel24}
-/lib/modules/%{_kernel_ver}/misc/drbd.o
+/lib/modules/%{_kernel_ver}/block/drbd.o
%else
/lib/modules/%{_kernel_ver}/block/drbd.o
%endif
-%if %{_kernel24}
+%if 1
%files -n kernel-smp-block-drbd
%defattr(644,root,root,755)
%doc *.gz
%if %{_kernel24}
-/lib/modules/%{_kernel_ver}smp/misc/drbd.o
+/lib/modules/%{_kernel_ver}smp/block/drbd.o
%else
/lib/modules/%{_kernel_ver}smp/block/drbd.o
%endif