packages: drbd/drbd.spec - updated to 8.4.1, package legacy utils

[adamg]

Author: adamg                        Date: Thu Dec 29 18:06:01 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 8.4.1, package legacy utils

---- Files affected:
packages/drbd:
   drbd.spec (1.147 -> 1.148) 

---- Diffs:

================================================================
Index: packages/drbd/drbd.spec
diff -u packages/drbd/drbd.spec:1.147 packages/drbd/drbd.spec:1.148
--- packages/drbd/drbd.spec:1.147	Wed Nov  9 16:41:53 2011
+++ packages/drbd/drbd.spec	Thu Dec 29 19:05:56 2011
@@ -10,12 +10,12 @@
 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.4.0
-Release:	2
+Version:	8.4.1
+Release:	1
 License:	GPL v2+
 Group:		Base/Kernel
 Source0:	http://oss.linbit.com/drbd/8.4/%{name}-%{version}.tar.gz
-# Source0-md5:	8519246dff4e2de14595d71abcd54db4
+# Source0-md5:	3af0cc49ee0b5005ea108c5ba92aa755
 URL:		http://www.drbd.org/
 BuildRequires:	bison
 BuildRequires:	flex
@@ -97,7 +97,9 @@
 %setup -q
 
 %build
-%configure
+%configure \
+	--with-initdir=/etc/rc.d/init.d
+
 %{__make} tools \
 	KVER=dummy \
 	CC="%{__cc}" \
@@ -110,16 +112,12 @@
 	$RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/ha.d/resource.d} \
 	$RPM_BUILD_ROOT/var/lib/drbd
 
-%{__make} install -C scripts \
+%{__make} install \
 	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
+# let's keep legacy utils in /sbin
+mv $RPM_BUILD_ROOT/lib/drbd/drbd{adm,setup}-83 $RPM_BUILD_ROOT/sbin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -147,6 +145,8 @@
 %attr(755,root,root) /sbin/drbdadm
 %attr(4754,root,haclient) /sbin/drbdsetup
 %attr(4754,root,haclient) /sbin/drbdmeta
+%attr(755,root,root) /sbin/drbdadm-83
+%attr(755,root,root) /sbin/drbdsetup-83
 %attr(754,root,root) /etc/rc.d/init.d/drbd
 %dir %{_sysconfdir}/drbd.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drbd.conf
@@ -178,6 +178,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.148  2011/12/29 18:05:56  adamg
+- updated to 8.4.1, package legacy utils
+
 Revision 1.147  2011/11/09 15:41:53  glen
 - put BR to the proper place (BR is global, not subpackage specific)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drbd/drbd.spec?r1=1.147&r2=1.148&f=u