SPECS (AC-branch): drbd8.spec - merge from LINUX_2_6_22 branch, old one in ...

Thu Jul 3 11:44:10 CEST 2008

Author: glen                         Date: Thu Jul  3 09:44:10 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge from LINUX_2_6_22 branch, old one in LINUX_2_6_16 branch

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

---- Diffs:

================================================================
Index: SPECS/drbd8.spec
diff -u SPECS/drbd8.spec:1.1.2.3 SPECS/drbd8.spec:1.1.2.4

--- SPECS/drbd8.spec:1.1.2.3	Tue Jun  3 09:11:54 2008
+++ SPECS/drbd8.spec	Thu Jul  3 11:44:05 2008
@@ -3,33 +3,28 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	up		# don't build UP module
-%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
 
 %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		3
 %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,12 +79,13 @@
 %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
+Obsoletes:	kernel%{_alt_kernel}-smp-block-drbd8
 
 %description -n kernel%{_alt_kernel}-block-drbd8
 drbd is a block device which is designed to build high availability
@@ -101,26 +97,6 @@
 niezawodności. drbd działa jako mirroring całego urządzenia blokowego
 przez (dedykowaną) sieć. Może być widoczny jako sieciowy RAID1.
 
-%package -n kernel%{_alt_kernel}-smp-block-drbd8
-Summary:	SMP kernel module with drbd - a block device designed to build high availibility clusters
-Summary(pl.UTF-8):	Wersja SMP Modułu jądra do drbd - urządzenia blokowego dla klastrów o wysokiej niezawodności
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-%{?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
-clusters. This is done by mirroring a whole block device via (a
-dedicated) network. You could see it as a network RAID1.
-
-%description -n kernel%{_alt_kernel}-smp-block-drbd8 -l pl.UTF-8
-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.
-
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
@@ -172,12 +148,6 @@
 %postun -n kernel%{_alt_kernel}-block-drbd8
 %depmod %{_kernel_ver}
 
-%post -n kernel%{_alt_kernel}-smp-block-drbd8
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-block-drbd8
-%depmod %{_kernel_ver}smp
-
 %pre -n drbdsetup8
 %groupadd -g 60 haclient
 
@@ -196,7 +166,6 @@
 	%groupremove haclient
 fi
 
-
 %if %{with userspace}
 %files -n drbdsetup8
 %defattr(644,root,root,755)
@@ -210,27 +179,27 @@
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-block-drbd8
 %defattr(644,root,root,755)
 %doc ChangeLog README
 /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.ko*
-%endif
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.4  2008/07/03 09:44:05  glen
+- merge from LINUX_2_6_22 branch, old one in LINUX_2_6_16 branch
+
+Revision 1.1.2.3.2.2  2008/07/02 15:03:51  glen
+- release 2
+
+Revision 1.1.2.3.2.1  2008/07/02 14:58:32  glen
+- prepare for 2.6.22 kernel on ac
+
 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.4&f=u

