- put drbd.ko in kernel/driver/block to satisfy dir dep

[packages/drbd.git] / drbd.spec

diff --git a/drbd.spec b/drbd.spec
index 8ce67447460ad5e96c2ee68d1478219d2644fd8a..312a0fd6a39829b92683aec1e0ecf6c85887bc55 100644 (file)
--- a/drbd.spec
+++ b/drbd.spec
@@ -1,6 +1,9 @@
 #
 # TODO:
 #  - trigger to update drbd-8.2 config
+#  - warning: Installed (but unpackaged) file(s) found:
+#     /etc/xen/scripts/block-drbd
+#     /usr/lib/ocf/resource.d/linbit/drbd
 #
 # Conditional build:
 %bcond_without dist_kernel     # allow non-distribution kernel
@@ -23,7 +26,7 @@
 %undefine      with_userspace
 %endif
 
-%define                _rel    1
+%define                _rel    3
 %define                pname   drbd
 Summary:       drbd is a block device designed to build high availibility clusters
 Summary(pl.UTF-8):     drbd jest urządzeniem blokowym dla klastrów o wysokiej niezawodności
@@ -36,6 +39,8 @@ Source0:      http://oss.linbit.com/drbd/8.3/%{pname}-%{version}.tar.gz
 # Source0-md5: 8aa8f7891d397ff25b7a3f77f56d353b
 Patch0:                %{pname}-Makefile.patch
 Patch1:                %{pname}-swab.patch
+Patch2:                %{pname}-parallel-install.patch
+Patch3:                %{pname}-bash-completion-install.patch
 URL:           http://www.drbd.org/
 %if %{with userspace}
 BuildRequires: bison
@@ -113,10 +118,24 @@ This package provides bash-completion for drbd.
 %description -n bash-completion-drbd -l pl.UTF-8
 Ten pakiet dostarcza bashowe uzupełnianie poleceń dla drbd.
 
+%package -n drbd-udev
+Summary:       udev rules for drbd kernel module
+Summary(pl.UTF-8):     Reguły udev dla modułów jądra Linuksa dla drbd
+Group:         Base/Kernel
+Requires:      udev-core
+
+%description -n drbd-udev
+udev rules for drbd kernel module.
+
+%description -n drbd-udev -l pl.UTF-8
+Reguły udev dla modułu jądra Linuksa dla drbd.
+
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %if %{with userspace}
@@ -141,11 +160,12 @@ install -d $RPM_BUILD_ROOT{/sbin,%{_mandir}/man{5,8},%{_sysconfdir}} \
        $RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/ha.d/resource.d}
 
 %if %{with kernel}
-%install_kernel_modules -m drbd/drbd -d block
+%install_kernel_modules -m drbd/drbd -d kernel/drivers/block
 %endif
 
 %if %{with userspace}
 %{__make} install -C scripts \
+       DRBD_ENABLE_UDEV=1 \
        PREFIX=$RPM_BUILD_ROOT
 install scripts/drbd $RPM_BUILD_ROOT/etc/rc.d/init.d
 rm -rf $RPM_BUILD_ROOT/etc/init.d
@@ -191,14 +211,20 @@ fi
 %attr(2754,root,haclient) /sbin/drbdmeta
 %attr(754,root,root) /etc/rc.d/init.d/drbd
 %attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/drbddisk
+%attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/drbdupper
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.conf
 %{_mandir}/man[58]/*
 %dir /usr/lib/drbd
 %attr(755,root,root) /usr/lib/drbd/*
+%attr(755,root,root) %{_sbindir}/drbd-overview
 
 %files -n bash-completion-drbd
 %defattr(644,root,root,755)
 /etc/bash_completion.d/drbdadm
+
+%files -n drbd-udev
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/65-drbd.rules
 %endif
 
 %if %{with kernel}