SPECS (AC-branch): drbd8.spec - cp from drbd.spec:1.90.2.24 - drbd-8.x for ...

[adamg]

Author: adamg                        Date: Sun May 11 10:28:01 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- cp from drbd.spec:1.90.2.24
- drbd-8.x for AC, conflicts with drbd-0.7

---- Files affected:
SPECS:
   drbd8.spec (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SPECS/drbd8.spec
diff -u SPECS/drbd8.spec:1.1.2.1 SPECS/drbd8.spec:1.1.2.2
--- SPECS/drbd8.spec:1.1.2.1	Wed Dec 26 23:29:52 2007
+++ SPECS/drbd8.spec	Sun May 11 12:27:55 2008
@@ -28,13 +28,13 @@
 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}8%{_alt_kernel}
-Version:	8.2.1
+Version:	8.2.5
 Release:	%{_rel}
 License:	GPL
 Group:		Base/Kernel
 Source0:	http://oss.linbit.com/drbd/8.2/%{pname}-%{version}.tar.gz
-# Source0-md5:	345c1056b2033184a7935c1bb79cc57e
-Patch0:		%{pname}-Makefile.patch
+# Source0-md5:	f3297c1d032fd90cd0441285fef05bcb
+Patch0:		%{pname}8-Makefile.patch
 URL:		http://www.drbd.org/
 %if %{with userspace}
 BuildRequires:	bison
@@ -73,7 +73,7 @@
 Requires:	rc-scripts
 Provides:	group(haclient)
 Conflicts:	drbdsetup24
-Conflicts:	drbdsetup
+Conflicts:	drbdsetup < 8.0.0
 
 %description -n drbdsetup8
 Setup tool and init scripts for DRBD.
@@ -89,6 +89,7 @@
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
 Requires:	drbdsetup8
+Conflicts:	kernel%{_alt_kernel}-block-drbd
 
 %description -n kernel%{_alt_kernel}-block-drbd8
 drbd is a block device which is designed to build high availability
@@ -108,6 +109,7 @@
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
 Requires:	drbdsetup8
+Conflicts:	kernel%{_alt_kernel}-smp-block-drbd
 
 %description -n kernel%{_alt_kernel}-smp-block-drbd8
 drbd is a block device which is designed to build high availability
@@ -122,12 +124,12 @@
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
-#%patch1 -p1
 
 %build
 %if %{with userspace}
 %{__make} tools \
 	KVER=dummy \
+	KDIR=/usr/include \
 	CC="%{__cc}" \
 	OPTCFLAGS="%{rpmcflags}" \
 	LDFLAGS="%{rpmldflags}"
@@ -147,7 +149,7 @@
 	$RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/ha.d/resource.d}
 
 %if %{with kernel}
-%install_kernel_modules -m drbd/drbd -d block -s 8
+%install_kernel_modules -m drbd/drbd -d block
 %endif
 
 %if %{with userspace}
@@ -194,6 +196,7 @@
 	%groupremove haclient
 fi
 
+
 %if %{with userspace}
 %files -n drbdsetup8
 %defattr(644,root,root,755)
@@ -211,14 +214,14 @@
 %files -n kernel%{_alt_kernel}-block-drbd8
 %defattr(644,root,root,755)
 %doc ChangeLog README
-/lib/modules/%{_kernel_ver}/block/drbd-8.ko*
+/lib/modules/%{_kernel_ver}/block/drbd.ko*
 %endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-block-drbd8
 %defattr(644,root,root,755)
 %doc ChangeLog README
-/lib/modules/%{_kernel_ver}smp/block/drbd-8.ko*
+/lib/modules/%{_kernel_ver}smp/block/drbd.ko*
 %endif
 %endif
 
@@ -228,11 +231,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.2  2008-05-11 10:27:55  adamg
+- cp from drbd.spec:1.90.2.24
+- drbd-8.x for AC, conflicts with drbd-0.7
+
 Revision 1.1.2.1  2007-12-26 22:29:52  glen
 - drop old changelog
 
 Revision 1.1  2007-12-26 22:18:52  adamg
 - drbd8 for Ac
-
-Revision 1.90.4.21  2007-12-26 12:37:55  glen
-- updated to 8.2.1 from HEAD
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/drbd8.spec?r1=1.1.2.1&r2=1.1.2.2&f=u