X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=drbd.spec;h=8639542a618c508a55be466f0729ce2842dec85b;hb=b754d03c86d8604977aecdc75d7543f60b11b790;hp=fe84b773e9fc452bd8d05914915ecc851e60731e;hpb=051b4c42f4f4253289079dbc73f0ce81df702e8b;p=packages%2Fdrbd.git diff --git a/drbd.spec b/drbd.spec index fe84b77..8639542 100644 --- a/drbd.spec +++ b/drbd.spec @@ -1,43 +1,24 @@ # -# Conditional build: -%bcond_without dist_kernel # allow non-distribution kernel -%bcond_without kernel # don't build kernel modules -%bcond_without userspace # don't build userspace module -%bcond_with verbose # verbose build (V=1) -%bcond_with grsec_kernel # build for kernel-grsecurity +# 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 - -%if %{without kernel} -%undefine with_dist_kernel -%endif -%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel} -%define alt_kernel grsecurity -%endif -%if "%{_alt_kernel}" != "%{nil}" -%undefine with_userspace -%endif - -%define _rel 1 -%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 -Name: %{pname}%{_alt_kernel} -Version: 8.2.5 -Release: %{_rel} -License: GPL +Name: drbd +Version: 8.4.0 +Release: 2 +License: GPL v2+ Group: Base/Kernel -Source0: http://oss.linbit.com/drbd/8.2/%{pname}-%{version}.tar.gz -# Source0-md5: f3297c1d032fd90cd0441285fef05bcb -Patch0: %{pname}-Makefile.patch +Source0: http://oss.linbit.com/drbd/8.4/%{name}-%{version}.tar.gz +# Source0-md5: 8519246dff4e2de14595d71abcd54db4 URL: http://www.drbd.org/ -%if %{with userspace} BuildRequires: bison BuildRequires: flex -%endif -%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2} BuildRequires: rpmbuild(macros) >= 1.379 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -69,6 +50,7 @@ Requires(pre): /usr/sbin/groupadd Requires(postun): /usr/sbin/groupdel Requires: rc-scripts Provides: group(haclient) +Obsoletes: drbdsetup8 Conflicts: drbdsetup24 %description -n drbdsetup @@ -77,75 +59,71 @@ Setup tool and init scripts for DRBD. %description -n drbdsetup -l pl.UTF-8 Narzędzie konfiguracyjne i skrypty startowe dla DRBD. -%package -n kernel%{_alt_kernel}-block-drbd -Summary: Kernel module with drbd - a block device designed to build high availibility clusters -Summary(pl.UTF-8): Moduł jądra do drbd - urządzenia blokowego dla klastrów o wysokiej niezawodności -Release: %{_rel}@%{_kernel_ver_str} +%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 +Group: Applications/Shells +Requires: bash-completion + +%description -n bash-completion-drbd +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 -%{?with_dist_kernel:%requires_releq_kernel} -Requires(post,postun): /sbin/depmod -Requires: drbdsetup +BuildRequires: udev-core +Requires: udev-core -%description -n kernel%{_alt_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 drbd-udev +udev rules for drbd kernel module. -%description -n kernel%{_alt_kernel}-block-drbd -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 -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 +%setup -q %build -%if %{with userspace} +%configure %{__make} tools \ KVER=dummy \ CC="%{__cc}" \ OPTCFLAGS="%{rpmcflags}" \ LDFLAGS="%{rpmldflags}" -%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) -%build_kernel_modules -m drbd -%endif %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 -%if %{with kernel} -%install_kernel_modules -m drbd/drbd -d block -%endif +%{__make} install -C scripts \ + DRBD_ENABLE_UDEV=1 \ + DESTDIR=$RPM_BUILD_ROOT -%if %{with userspace} -install user/{drbdadm,drbdmeta,drbdsetup} $RPM_BUILD_ROOT/sbin -install scripts/drbd.conf $RPM_BUILD_ROOT%{_sysconfdir} install scripts/drbd $RPM_BUILD_ROOT/etc/rc.d/init.d - -install scripts/drbddisk $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.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%{_alt_kernel}-block-drbd -%depmod %{_kernel_ver} - -%postun -n kernel%{_alt_kernel}-block-drbd -%depmod %{_kernel_ver} - %pre -n drbdsetup %groupadd -g 60 haclient @@ -164,22 +142,32 @@ if [ "$1" = "0" ]; then %groupremove haclient fi - -%if %{with userspace} %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 +%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/* + +%files -n bash-completion-drbd +%defattr(644,root,root,755) +/etc/bash_completion.d/drbdadm -%if %{with kernel} -%files -n kernel%{_alt_kernel}-block-drbd +%files -n drbd-udev %defattr(644,root,root,755) -%doc ChangeLog README -/lib/modules/%{_kernel_ver}/block/drbd.ko* -%endif +%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/65-drbd.rules