- added depmod options so modules can be installed for kernel other than running

[packages/drbd.git] / drbd.spec

diff --git a/drbd.spec b/drbd.spec
index 221916935403b42d18e2d500d56a21ab4d4aae64..e9e2fc96c28f5dbd7a93ac7f6769de794bc7f380 100644 (file)
--- a/drbd.spec
+++ b/drbd.spec
@@ -1,16 +1,14 @@
-
-# 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)
+#
+# Conditional build:
+# _without_dist_kernel          without kernel from distribution
+#
 %define                _kernel24       %(echo %{_kernel_ver} | grep -q '2\.[012]\.' ; echo $?)
 
 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
+%define        rel     14
 Release:       %{rel}
 License:       GPL
 Group:         Base/Kernel
@@ -42,8 +40,8 @@ Summary:      Setup tool and scripts for DRBD
 Summary(pl):   Narzêdzie konfiguracyjne i skrypty dla DRBD
 Summary(pt_BR):        Utilitários para gerenciar dispositivos DRBD
 Group:         Applications/System
-Prereq:                rc-scripts
-Prereq:                chkconfig
+PreReq:                rc-scripts
+Requires(post,preun):  /sbin/chkconfig
 
 %description -n drbdsetup
 Setup tool and init scripts for DRBD.
@@ -56,12 +54,9 @@ Summary:     kernel module with drbd - a block device designed to build high availib
 Summary(pl):   Modu³ kernela do drbd - urz±dzenia blokowego dla klastrów o wysokiej niezawodno¶ci
 Release:       %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
-Prereq:                /sbin/depmod
+%{!?_without_dist_kernel:%requires_releq_kernel_up}
+Requires(post,postun): /sbin/depmod
 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
@@ -78,12 +73,9 @@ Summary:     SMP kernel module with drbd - a block device designed to build high ava
 Summary(pl):   Modu³ kernela SMP do drbd - urz±dzenia blokowego dla klastrów o wysokiej niezawodno¶ci
 Release:       %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
-Prereq:                /sbin/depmod
+%{!?_without_dist_kernel:%requires_releq_kernel_smp}
+Requires(post,postun): /sbin/depmod
 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
@@ -115,9 +107,10 @@ przez (dedykowan
        SMPFLAG="-D__SMP__ -D__KERNEL_SMP=1" \
        KERNVER="%{_kernel_ver}" \
        INCLUDE="-I%{_kernelsrcdir}/include" \
-       DEBUGFLAGS="%{rpmcflags} %{?debug:-DDBG}"
+       DEBUGFLAGS="%{rpmcflags} %{?debug:-DDBG}" \
+       CC="%{kgcc}"
 
-mv drbd/drbd.o drbd-smp.o
+mv -f drbd/drbd.o drbd-smp.o
 # SMP end
 
 # UP begin
@@ -132,7 +125,8 @@ mv drbd/drbd.o drbd-smp.o
        SMPFLAG="" \
        KERNVER="%{_kernel_ver}" \
        INCLUDE="-I%{_kernelsrcdir}/include" \
-       DEBUGFLAGS="%{rpmcflags} %{?debug:-DDBG}"
+       DEBUGFLAGS="%{rpmcflags} %{?debug:-DDBG}" \
+       CC="%{kgcc}"
 # SMP end
 
 %install
@@ -140,15 +134,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}
@@ -158,22 +146,20 @@ ln -sf /etc/rc.d/init.d/drbd $RPM_BUILD_ROOT/etc/ha.d/resource.d/datadisk
 install documentation/drbd.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
 install documentation/drbdsetup.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
-gzip -9nf ChangeLog README TODO
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post   -n kernel-block-drbd
-/sbin/depmod -a
+/sbin/depmod -a -F /boot/System.map-%{_kernel_ver} %{_kernel_ver}
 
 %postun -n kernel-block-drbd
-/sbin/depmod -a
+/sbin/depmod -a -F /boot/System.map-%{_kernel_ver} %{_kernel_ver}
 
 %post   -n kernel-smp-block-drbd
-/sbin/depmod -a
+/sbin/depmod -a -F /boot/System.map-%{_kernel_ver}smp %{_kernel_ver}smp
 
 %postun -n kernel-smp-block-drbd
-/sbin/depmod -a
+/sbin/depmod -a -F /boot/System.map-%{_kernel_ver}smp %{_kernel_ver}smp
 
 %post -n drbdsetup
 /sbin/chkconfig --add drbd
@@ -201,20 +187,10 @@ 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
+%doc ChangeLog README TODO
+/lib/modules/%{_kernel_ver}/misc/*
 
-%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
+%doc ChangeLog README TODO
+/lib/modules/%{_kernel_ver}smp/misc/*