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

diff --git a/drbd.spec b/drbd.spec
index e9465d7..8639542 100644
--- a/drbd.spec
+++ b/drbd.spec
@@ -1,30 +1,25 @@
 #
-# Conditional build:
-%bcond_without	dist_kernel	# allow non-distribution kernel
-%bcond_without	kernel		# don't build kernel modules
-%bcond_without	smp		# don't build SMP module
-%bcond_without	userspace	# don't build userspace module
-%bcond_with	verbose		# verbose build (V=1)
+# TODO:
+#  - trigger to update drbd-8.2 config
+#  - warning: Installed (but unpackaged) file(s) found:
+#     /etc/xen/scripts/block-drbd
+#  - add some provides/requires to keep in sync with kernel releases
+#    Linux 3.0.8 got drbd module version 8.3.11
 #
-%ifarch sparc
-%undefine	with_smp
-%endif
 
 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
+Summary(pl.UTF-8):	drbd jest urządzeniem blokowym dla klastrów o wysokiej niezawodności
 Name:		drbd
-Version:	0.7.15
-%define	rel	3
-Release:	%{rel}
-License:	GPL
+Version:	8.4.0
+Release:	2
+License:	GPL v2+
 Group:		Base/Kernel
-Source0:	http://oss.linbit.com/drbd/0.7/%{name}-%{version}.tar.gz
-# Source0-md5:	b7d421e91c3c1298f163220cff983071
+Source0:	http://oss.linbit.com/drbd/8.4/%{name}-%{version}.tar.gz
+# Source0-md5:	8519246dff4e2de14595d71abcd54db4
 URL:		http://www.drbd.org/
 BuildRequires:	bison
 BuildRequires:	flex
-%{?with_dist_kernel:BuildRequires:	kernel-module-build}
-BuildRequires:	rpmbuild(macros) >= 1.118
+BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,200 +27,147 @@ drbd is a block device which is designed to build high availability
 clusters. This is done by mirroring a whole block device via (a
 dedicated) network. You could see it as a network RAID1.
 
-%description -l pl
-drbd jest urz±dzeniem blokowym zaprojektowanym dla klastrów o wysokiej
-niezawodno¶ci. drbd dzia³a jako mirroring ca³ego urz±dzenia blokowego
-przez (dedykowan±) sieæ. Mo¿e byæ widoczny jako sieciowy RAID1.
+%description -l pl.UTF-8
+drbd jest urządzeniem blokowym zaprojektowanym dla klastrów o wysokiej
+niezawodności. drbd działa jako mirroring całego urządzenia blokowego
+przez (dedykowaną) sieć. Może być widoczny jako sieciowy RAID1.
 
-%description -l pt_BR
-O DRBD é um dispositivo de bloco que é projetado para construir
-clusters de Alta Disponibilidade. Isto é feito espelhando um
-dispositivo de bloco inteiro via rede (dedicada ou não). Pode ser
-visto como um RAID 1 via rede. Este pacote contém utilitários para
+%description -l pt_BR.UTF-8
+O DRBD é um dispositivo de bloco que é projetado para construir
+clusters de Alta Disponibilidade. Isto é feito espelhando um
+dispositivo de bloco inteiro via rede (dedicada ou não). Pode ser
+visto como um RAID 1 via rede. Este pacote contém utilitários para
 gerenciar dispositivos DRBD.
 
 %package -n drbdsetup
 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
+Summary(pl.UTF-8):	Narzędzie konfiguracyjne i skrypty dla DRBD
+Summary(pt_BR.UTF-8):	Utilitários para gerenciar dispositivos DRBD
 Group:		Applications/System
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(postun):	/usr/sbin/groupdel
+Requires:	rc-scripts
+Provides:	group(haclient)
+Obsoletes:	drbdsetup8
 Conflicts:	drbdsetup24
 
 %description -n drbdsetup
 Setup tool and init scripts for DRBD.
 
-%description -n drbdsetup -l pl
-Narzêdzie konfiguracyjne i skrypty startowe dla DRBD.
+%description -n drbdsetup -l pl.UTF-8
+Narzędzie konfiguracyjne i skrypty startowe dla DRBD.
 
-%package -n kernel-block-drbd
-Summary:	Kernel module with drbd - a block device designed to build high availibility clusters
-Summary(pl):	Modu³ j±dra do drbd - urz±dzenia blokowego dla klastrów o wysokiej niezawodno¶ci
-Release:	%{rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
-Requires(post,postun):	/sbin/depmod
-Requires:	drbdsetup
+%package -n resource-agents-drbd
+Summary:	DRBD resource agents for a cluster setup
+Group:		Daemons
+Requires:	heartbeat
+Requires:	resource-agents
 
-%description -n kernel-block-drbd
-drbd is a block device which is designed to build high availability
-clusters. This is done by mirroring a whole block device via (a
-dedicated) network. You could see it as a network RAID1.
+%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
+Group:		Applications/Shells
+Requires:	bash-completion
+
+%description -n bash-completion-drbd
+This package provides bash-completion for drbd.
 
-%description -n kernel-block-drbd -l pl
-drbd jest urz±dzeniem blokowym zaprojektowanym dla klastrów o wysokiej
-niezawodno¶ci. drbd dzia³a jako mirroring ca³ego urz±dzenia blokowego
-przez (dedykowan±) sieæ. Mo¿e byæ widoczny jako sieciowy RAID1.
+%description -n bash-completion-drbd -l pl.UTF-8
+Ten pakiet dostarcza bashowe uzupełnianie poleceń dla drbd.
 
-%package -n kernel-smp-block-drbd
-Summary:	SMP kernel module with drbd - a block device designed to build high availibility clusters
-Summary(pl):	Wersja SMP Modu³u j±dra do drbd - urz±dzenia blokowego dla klastrów o wysokiej niezawodno¶ci
-Release:	%{rel}@%{_kernel_ver_str}
+%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
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun):	/sbin/depmod
-Requires:	drbdsetup
+BuildRequires:	udev-core
+Requires:	udev-core
 
-%description -n kernel-smp-block-drbd
-drbd is a block device which is designed to build high availability
-clusters. This is done by mirroring a whole block device via (a
-dedicated) network. You could see it as a network RAID1.
+%description -n drbd-udev
+udev rules for drbd kernel module.
 
-%description -n kernel-smp-block-drbd -l pl
-drbd jest urz±dzeniem blokowym zaprojektowanym dla klastrów o wysokiej
-niezawodno¶ci. drbd dzia³a jako mirroring ca³ego urz±dzenia blokowego
-przez (dedykowan±) sieæ. Mo¿e byæ widoczny jako sieciowy RAID1.
+%description -n drbd-udev -l pl.UTF-8
+Reguły udev dla modułu jądra Linuksa dla drbd.
 
 %prep
 %setup -q
 
 %build
-%if %{with userspace}
+%configure
 %{__make} tools \
-	CC="%{__cc}"
-%endif
-
-%if %{with kernel}
-cd drbd
-sed -i -e 's#$(CONFIG_BLK_DEV_DRBD)#m#g' Makefile-2.6
-ln -sf Makefile-2.6 Makefile
-# kernel module(s)
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-		exit 1
-	fi
-	rm -rf include
-	install -d include/{linux,config}
-	ln -sf %{_kernelsrcdir}/config-$cfg .config
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-%ifarch ppc
-	if [ -d "%{_kernelsrcdir}/include/asm-powerpc" ]; then
-		install -d include/asm
-		cp -a %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
-		cp -a %{_kernelsrcdir}/include/asm-powerpc/* include/asm
-	else
-		ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-	fi
-%else
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-%endif
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	touch include/config/MARKER
-	%{__make} -C %{_kernelsrcdir} clean \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD \
-		%{?with_verbose:V=1}
-	%{__make} -C %{_kernelsrcdir} modules \
-%if "%{_target_base_arch}" != "%{_arch}"
-		ARCH=%{_target_base_arch} \
-		CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \
-%endif
-		HOSTCC="%{__cc}" \
-		CPP="%{__cpp}" \
-		M=$PWD O=$PWD \
-		%{?with_verbose:V=1}
-	mv drbd{,-$cfg}.ko
-done
-%endif
+	KVER=dummy \
+	CC="%{__cc}" \
+	OPTCFLAGS="%{rpmcflags}" \
+	LDFLAGS="%{rpmldflags}"
 
 %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}
-
-%if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install drbd/drbd-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/drbd.ko
-%if %{with smp} && %{with dist_kernel}
-install drbd/drbd-smp.ko \
-		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/drbd.ko
-%endif
-%endif
-
-%if %{with userspace}
-install user/{drbdadm,drbdsetup} $RPM_BUILD_ROOT/sbin
-install scripts/drbd.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install scripts/drbd $RPM_BUILD_ROOT/etc/rc.d/init.d
+	$RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/ha.d/resource.d} \
+	$RPM_BUILD_ROOT/var/lib/drbd
 
-ln -sf /etc/rc.d/init.d/drbd $RPM_BUILD_ROOT/etc/ha.d/resource.d/datadisk
+%{__make} install -C scripts \
+	DRBD_ENABLE_UDEV=1 \
+	DESTDIR=$RPM_BUILD_ROOT
+
+install scripts/drbd $RPM_BUILD_ROOT/etc/rc.d/init.d
+rm -rf $RPM_BUILD_ROOT/etc/init.d
+install user/{drbdadm,drbdmeta,drbdsetup} $RPM_BUILD_ROOT/sbin
 
 install documentation/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
 install documentation/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n kernel-block-drbd
-%depmod %{_kernel_ver}
-
-%postun -n kernel-block-drbd
-%depmod %{_kernel_ver}
-
-%post -n kernel-smp-block-drbd
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel-smp-block-drbd
-%depmod %{_kernel_ver}smp
+%pre -n drbdsetup
+%groupadd -g 60 haclient
 
 %post -n drbdsetup
 /sbin/chkconfig --add drbd
-if [ -f /var/lock/subsys/drbd ]; then
-	/etc/rc.d/init.d/drbd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/drbd start\" to start drbd service." >&2
-fi
+%service drbd restart
 
 %preun -n drbdsetup
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/drbd ]; then
-		/etc/rc.d/init.d/drbd stop
-	fi
+	%service drbd stop
 	/sbin/chkconfig --del drbd
 fi
 
-%if %{with userspace}
+%postun -n drbdsetup
+if [ "$1" = "0" ]; then
+	%groupremove haclient
+fi
+
 %files -n drbdsetup
 %defattr(644,root,root,755)
-%attr(755,root,root) /sbin/*
+%attr(755,root,root) /sbin/drbdadm
+%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/datadisk
+%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]/*
-%endif
+%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/*
 
-%if %{with kernel}
-%files -n kernel-block-drbd
+%files -n bash-completion-drbd
 %defattr(644,root,root,755)
-%doc ChangeLog README
-/lib/modules/%{_kernel_ver}/misc/*
+/etc/bash_completion.d/drbdadm
 
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-block-drbd
+%files -n drbd-udev
 %defattr(644,root,root,755)
-%doc ChangeLog README
-/lib/modules/%{_kernel_ver}smp/misc/*
-%endif
-%endif
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/65-drbd.rules