X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=drbd.spec;h=8639542a618c508a55be466f0729ce2842dec85b;hb=b754d03c86d8604977aecdc75d7543f60b11b790;hp=c78c4607ad07e234f700b8afa01c75cb2e7e87d6;hpb=0064b3238c8a3adfbd3e7ac8da387bb9adecf560;p=packages%2Fdrbd.git

diff --git a/drbd.spec b/drbd.spec
index c78c460..8639542 100644
--- a/drbd.spec
+++ b/drbd.spec
@@ -3,18 +3,19 @@
 #  - 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
+#  - add some provides/requires to keep in sync with kernel releases
+#    Linux 3.0.8 got drbd module version 8.3.11
 #
 
 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
 Name:		drbd
-Version:	8.3.8.1
-Release:	1
-License:	GPL
+Version:	8.4.0
+Release:	2
+License:	GPL v2+
 Group:		Base/Kernel
-Source0:	http://oss.linbit.com/drbd/8.3/%{name}-%{version}.tar.gz
-# Source0-md5:	551dae488006af86a33eab1eba407f48
+Source0:	http://oss.linbit.com/drbd/8.4/%{name}-%{version}.tar.gz
+# Source0-md5:	8519246dff4e2de14595d71abcd54db4
 URL:		http://www.drbd.org/
 BuildRequires:	bison
 BuildRequires:	flex
@@ -49,8 +50,8 @@ Requires(pre):	/usr/sbin/groupadd
 Requires(postun):	/usr/sbin/groupdel
 Requires:	rc-scripts
 Provides:	group(haclient)
-Conflicts:	drbdsetup24
 Obsoletes:	drbdsetup8
+Conflicts:	drbdsetup24
 
 %description -n drbdsetup
 Setup tool and init scripts for DRBD.
@@ -58,6 +59,15 @@ Setup tool and init scripts for DRBD.
 %description -n drbdsetup -l pl.UTF-8
 Narzędzie konfiguracyjne i skrypty startowe dla DRBD.
 
+%package -n resource-agents-drbd
+Summary:	DRBD resource agents for a cluster setup
+Group:		Daemons
+Requires:	heartbeat
+Requires:	resource-agents
+
+%description -n resource-agents-drbd
+DRBD resource agents for a cluster setup.
+
 %package -n bash-completion-drbd
 Summary:	bash-completion for drbd
 Summary(pl.UTF-8):	Bashowe uzupełnianie poleceń dla drbd
@@ -74,6 +84,7 @@ Ten pakiet dostarcza bashowe uzupełnianie poleceń dla drbd.
 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
+BuildRequires:	udev-core
 Requires:	udev-core
 
 %description -n drbd-udev
@@ -96,7 +107,8 @@ Reguły udev dla modułu jądra Linuksa dla drbd.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/sbin,%{_mandir}/man{5,8},%{_sysconfdir}} \
-	$RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/ha.d/resource.d}
+	$RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/ha.d/resource.d} \
+	$RPM_BUILD_ROOT/var/lib/drbd
 
 %{__make} install -C scripts \
 	DRBD_ENABLE_UDEV=1 \
@@ -133,18 +145,24 @@ fi
 %files -n drbdsetup
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/drbdadm
-%attr(2754,root,haclient) /sbin/drbdsetup
-%attr(2754,root,haclient) /sbin/drbdmeta
+%attr(4754,root,haclient) /sbin/drbdsetup
+%attr(4754,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
-%attr(750,root,root) %dir %{_sysconfdir}/drbd.d
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.d/global_common.conf
+%dir %{_sysconfdir}/drbd.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.d/global_common.conf
 %{_mandir}/man[58]/*
 %dir /usr/lib/drbd
 %attr(755,root,root) /usr/lib/drbd/*
 %attr(755,root,root) %{_sbindir}/drbd-overview
+%attr(750,root,root) %dir /var/lib/drbd
+
+%files -n resource-agents-drbd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/drbddisk
+%attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/drbdupper
+%dir /usr/lib/ocf/resource.d/linbit
+%attr(755,root,root) /usr/lib/ocf/resource.d/linbit/*
 
 %files -n bash-completion-drbd
 %defattr(644,root,root,755)