- merge changes from LINUX_2_6_22 branch; rel 4 to rebuild with 2.6.16.62 kernel

Changed files:
    drbd8.spec -> 1.1.2.3.4.1

diff --git a/drbd8.spec b/drbd8.spec
index b50b4b737f88e8f3653b660cb3c56864e1306ce7..78e9b3bb6359ae9ea8b96317e31401e8f0254ca9 100644 (file)
--- a/drbd8.spec
+++ b/drbd8.spec
@@ -6,8 +6,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
@@ -15,20 +14,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
@@ -83,9 +83,9 @@ Narzędzie konfiguracyjne i skrypty startowe dla DRBD.
 %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
@@ -195,7 +195,6 @@ if [ "$1" = "0" ]; then
        %groupremove haclient
 fi
 
-
 %if %{with userspace}
 %files -n drbdsetup8
 %defattr(644,root,root,755)