- typo in patch number

[packages/drbd.git] / drbd.spec

diff --git a/drbd.spec b/drbd.spec
index da9c1342f8ce196123d80725939a35bf49d01b0d..038db7e69b6304c1e383b4b4e2b448304af8cb1e 100644 (file)
--- a/drbd.spec
+++ b/drbd.spec
@@ -1,4 +1,7 @@
 #
+# TODO:
+#  - trigger to update drbd-8.2 config
+#
 # Conditional build:
 %bcond_without dist_kernel     # allow non-distribution kernel
 %bcond_without kernel          # don't build kernel modules
@@ -6,21 +9,34 @@
 %bcond_with    verbose         # verbose build (V=1)
 %bcond_with    grsec_kernel    # build for kernel-grsecurity
 #
+%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
-#
-%define        _rel    1
+%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:          drbd
-Version:       8.2.1
+Name:          %{pname}%{_alt_kernel}
+Version:       8.3.2
 Release:       %{_rel}
 License:       GPL
 Group:         Base/Kernel
-Source0:       http://oss.linbit.com/drbd/8.2/%{name}-%{version}.tar.gz
-# Source0-md5: 345c1056b2033184a7935c1bb79cc57e
-Patch0:                %{name}-Makefile.patch
+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
 URL:           http://www.drbd.org/
 %if %{with userspace}
 BuildRequires: bison
@@ -59,6 +75,7 @@ Requires(postun):     /usr/sbin/groupdel
 Requires:      rc-scripts
 Provides:      group(haclient)
 Conflicts:     drbdsetup24
+Obsoletes:     drbdsetup8
 
 %description -n drbdsetup
 Setup tool and init scripts for DRBD.
@@ -85,9 +102,23 @@ 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.
 
+%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.
+
 %prep
-%setup -q
+%setup -q -n %{pname}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %if %{with userspace}
@@ -116,11 +147,11 @@ install -d $RPM_BUILD_ROOT{/sbin,%{_mandir}/man{5,8},%{_sysconfdir}} \
 %endif
 
 %if %{with userspace}
-install user/{drbdadm,drbdmeta,drbdsetup} $RPM_BUILD_ROOT/sbin
-install scripts/drbd.conf $RPM_BUILD_ROOT%{_sysconfdir}
+%{__make} install -C scripts \
+       PREFIX=$RPM_BUILD_ROOT
 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
@@ -164,6 +195,12 @@ fi
 %attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/drbddisk
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.conf
 %{_mandir}/man[58]/*
+%dir /usr/lib/drbd
+%attr(755,root,root) /usr/lib/drbd/*
+
+%files -n bash-completion-drbd
+%defattr(644,root,root,755)
+/etc/bash_completion.d/drbdadm
 %endif
 
 %if %{with kernel}