- release 2.

[packages/drbd.git] / drbd.spec

diff --git a/drbd.spec b/drbd.spec
index d2b504303b7d26fdaf1d6a1509dfeca4a59bd1fb..6af1a01c3378979e8b2ebcd0271667070c322262 100644 (file)
--- a/drbd.spec
+++ b/drbd.spec
@@ -1,12 +1,16 @@
+
+# conditional build
+# _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                _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
@@ -15,6 +19,7 @@ Group(pl):    Podstawowe/J
 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
@@ -53,16 +58,16 @@ Narz
 %package -n kernel-block-drbd
 Summary:       kernel module with drbd - a block device designed to build high availibility clusters
 Summary(pl):   Modu³ kernela do drbd - urz±dzenia blokowego dla klastrów o wysokiej niezawodno¶ci
-Release:       %{rel}@%{_kernel_ver}
+Release:       %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 Group(de):     Grundsätzlich/Kern
 Group(pl):     Podstawowe/J±dro
 Prereq:                /sbin/depmod
 Requires:      drbdsetup
 Conflicts:     kernel-smp-block-drbd
-Conflicts:     kernel-smp
-Conflicts:     kernel < %{_kernel_ver}
-Conflicts:     kernel > %{_kernel_ver}
+%{!?_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
@@ -77,16 +82,16 @@ przez (dedykowan
 %package -n kernel-smp-block-drbd
 Summary:       SMP kernel module with drbd - a block device designed to build high availibility clusters
 Summary(pl):   Modu³ kernela SMP do drbd - urz±dzenia blokowego dla klastrów o wysokiej niezawodno¶ci
-Release:       %{rel}@%{_kernel_ver}
+Release:       %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 Group(de):     Grundsätzlich/Kern
 Group(pl):     Podstawowe/J±dro
 Prereq:                /sbin/depmod
 Requires:      drbdsetup
 Conflicts:     kernel-block-drbd
-Conflicts:     kernel-up
-Conflicts:     kernel < %{_kernel_ver}
-Conflicts:     kernel > %{_kernel_ver}
+%{!?_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
@@ -105,7 +110,8 @@ przez (dedykowan
 %endif
 
 %build
-%if %{_kernel24}
+
+# SMP begin
 %{__make} \
 %ifarch %{ix86}
        KAF_i386="%{rpmcflags} -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer" \
@@ -120,8 +126,9 @@ przez (dedykowan
        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" \
@@ -134,22 +141,21 @@ mv drbd/drbd.o drbd-smp.o
        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}
@@ -205,17 +211,17 @@ fi
 %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