SPECS (LINUX_2_6_16): drbd8.spec - merge changes from LINUX_2_6_22 branch; ...

[glen]

Author: glen                         Date: Tue Sep 16 20:03:57 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- merge changes from LINUX_2_6_22 branch; rel 4 to rebuild with 2.6.16.62 kernel

---- Files affected:
SPECS:
   drbd8.spec (1.1.2.3 -> 1.1.2.3.4.1) 

---- Diffs:

================================================================
Index: SPECS/drbd8.spec
diff -u SPECS/drbd8.spec:1.1.2.3 SPECS/drbd8.spec:1.1.2.3.4.1
--- SPECS/drbd8.spec:1.1.2.3	Tue Jun  3 09:11:54 2008
+++ SPECS/drbd8.spec	Tue Sep 16 22:03:52 2008
@@ -7,8 +7,7 @@
 %bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
-%bcond_with	grsec_kernel	# build for kernel-grsecurity
-#
+
 %ifarch sparc
 %undefine	with_smp
 %endif
@@ -16,20 +15,21 @@
 %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
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define		_enable_debug_packages	0
+%endif
 
-%define		_rel	1
+%define		rel		4
 %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}8%{_alt_kernel}
 Version:	8.2.6
-Release:	%{_rel}
+Release:	%{rel}
 License:	GPL
 Group:		Base/Kernel
 Source0:	http://oss.linbit.com/drbd/8.2/%{pname}-%{version}.tar.gz
@@ -84,9 +84,9 @@
 %package -n kernel%{_alt_kernel}-block-drbd8
 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}
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 Requires(post,postun):	/sbin/depmod
 Requires:	drbdsetup8
 Conflicts:	kernel%{_alt_kernel}-block-drbd
@@ -196,7 +196,6 @@
 	%groupremove haclient
 fi
 
-
 %if %{with userspace}
 %files -n drbdsetup8
 %defattr(644,root,root,755)
@@ -231,6 +230,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.3.4.1  2008/09/16 20:03:52  glen
+- merge changes from LINUX_2_6_22 branch; rel 4 to rebuild with 2.6.16.62 kernel
+
 Revision 1.1.2.3  2008/06/03 07:11:54  adamg
 - updated to 8.2.6
 
================================================================

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