SPECS: drbd.spec - merge with DEVEL

[jajcus]

Author: jajcus                       Date: Thu Sep 13 20:21:07 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge with DEVEL

---- Files affected:
SPECS:
   drbd.spec (1.98 -> 1.99) 

---- Diffs:

================================================================
Index: SPECS/drbd.spec
diff -u SPECS/drbd.spec:1.98 SPECS/drbd.spec:1.99
--- SPECS/drbd.spec:1.98	Mon Jun  4 16:55:19 2007
+++ SPECS/drbd.spec	Thu Sep 13 22:21:02 2007
@@ -15,12 +15,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:	0.7.24
+Version:	8.0.5
 Release:	%{_rel}
 License:	GPL
 Group:		Base/Kernel
-Source0:	http://oss.linbit.com/drbd/0.7/%{name}-%{version}.tar.gz
-# Source0-md5:	b2c7335514a355b874a634dc12b22522
+Source0:	http://oss.linbit.com/drbd/8.0/%{name}-%{version}.tar.gz
+# Source0-md5:	b5463772f1749e86c8c29e56b0e9938b
 Patch0:		%{name}-Makefile.patch
 URL:		http://www.drbd.org/
 %if %{with userspace}
@@ -100,7 +100,7 @@
 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 EXTRA_CFLAGS="-DNO_MORE_DEV_FS"
+%build_kernel_modules -m drbd
 %endif
 
 %install
@@ -113,7 +113,7 @@
 %endif
 
 %if %{with userspace}
-install user/{drbdadm,drbdsetup} $RPM_BUILD_ROOT/sbin
+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
 
@@ -165,6 +165,30 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.99  2007/09/13 20:21:02  jajcus
+- merge with DEVEL
+
+Revision 1.90.2.7  2007/08/19 11:53:44  adamg
+- updated to 8.0.5
+
+Revision 1.90.2.6  2007/05/12 20:41:09  adamg
+- package drbdmeta too
+
+Revision 1.90.2.5  2007/05/12 20:21:48  adamg
+- updated to 8.0.3
+
+Revision 1.90.2.4  2007/04/07 21:18:01  zbyniu
+- bconds up, smp removed, package smp removed
+
+Revision 1.90.2.3  2007/04/05 13:02:54  zbyniu
+- up to 8.0.1; up bcond; s/misc/block/
+
+Revision 1.90.2.2  2007/02/12 13:20:12  baggins
+- converted to UTF-8
+
+Revision 1.90.2.1  2007/01/29 16:39:30  zbyniu
+- up to 8.0.0
+
 Revision 1.98  2007/06/04 14:55:19  adamg
 - updated to 0.7.24
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/drbd.spec?r1=1.98&r2=1.99&f=u