- release 8: rebuild against kernel 2.2.21.

[packages/drbd.git] / drbd.spec

diff --git a/drbd.spec b/drbd.spec
index 221916935403b42d18e2d500d56a21ab4d4aae64..421da8ab829e134b36e443c3a237cf110626f39b 100644 (file)
--- a/drbd.spec
+++ b/drbd.spec
@@ -1,16 +1,14 @@
 
 # conditional build
-# _without_dist_kernel          without kernel form ditribution
+# _without_dist_kernel          without kernel from distribution
 
-%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                _kernel24       %(echo %{_kernel_ver} | grep -q '2\.[012]\.' ; echo $?)
+%define        rel     8
 
 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.1
-%define        rel     3
 Release:       %{rel}
 License:       GPL
 Group:         Base/Kernel
@@ -57,11 +55,8 @@ Summary(pl): Modu
 Release:       %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 Prereq:                /sbin/depmod
+%{!?_without_dist_kernel:%requires_releq_kernel_up}
 Requires:      drbdsetup
-Conflicts:     kernel-smp-block-drbd
-%{!?_without_dist_kernel:Conflicts:    kernel-smp}
-%{!?_without_dist_kernel:Conflicts:    kernel < %{_kernel_ver}}
-%{!?_without_dist_kernel:Conflicts:    kernel > %{_kernel_ver}}
 
 %description -n kernel-block-drbd
 drbd is a block device which is designed to build high availability
@@ -79,11 +74,8 @@ Summary(pl): Modu
 Release:       %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 Prereq:                /sbin/depmod
+%{!?_without_dist_kernel:%requires_releq_kernel_smp}
 Requires:      drbdsetup
-Conflicts:     kernel-block-drbd
-%{!?_without_dist_kernel:Conflicts:    kernel-up}
-%{!?_without_dist_kernel:Conflicts:    kernel < %{_kernel_ver}}
-%{!?_without_dist_kernel:Conflicts:    kernel > %{_kernel_ver}}
 
 %description -n kernel-smp-block-drbd
 drbd is a block device which is designed to build high availability
@@ -117,7 +109,7 @@ przez (dedykowan
        INCLUDE="-I%{_kernelsrcdir}/include" \
        DEBUGFLAGS="%{rpmcflags} %{?debug:-DDBG}"
 
-mv drbd/drbd.o drbd-smp.o
+mv -f drbd/drbd.o drbd-smp.o
 # SMP end
 
 # UP begin
@@ -140,15 +132,9 @@ 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 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
-install drbd-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/block/drbd.o
-%endif
 
 install user/drbdsetup $RPM_BUILD_ROOT%{_sbindir}
 install scripts/drbd.conf $RPM_BUILD_ROOT%{_sysconfdir}
@@ -202,19 +188,9 @@ fi
 %files -n kernel-block-drbd
 %defattr(644,root,root,755)
 %doc *.gz
-%if %{_kernel24}
-/lib/modules/%{_kernel_ver}/block/drbd.o
-%else
-/lib/modules/%{_kernel_ver}/block/drbd.o
-%endif
+/lib/modules/%{_kernel_ver}/misc/drbd.o
 
-%if 1
 %files -n kernel-smp-block-drbd
 %defattr(644,root,root,755)
 %doc *.gz
-%if %{_kernel24}
-/lib/modules/%{_kernel_ver}smp/block/drbd.o
-%else
-/lib/modules/%{_kernel_ver}smp/block/drbd.o
-%endif
-%endif
+/lib/modules/%{_kernel_ver}smp/misc/drbd.o