Author: glen Date: Tue Sep 16 21:41:12 2008 GMT
Module: SPECS Tag: LINUX_2_6_16
---- Log message:
- merge changes from LINUX_2_6_22 branch; rel 3 to rebuild with 2.6.16.62 kernel
---- Files affected:
SPECS:
drbd.spec (1.90.4.25 -> 1.90.4.25.4.1)
---- Diffs:
================================================================
Index: SPECS/drbd.spec
diff -u SPECS/drbd.spec:1.90.4.25 SPECS/drbd.spec:1.90.4.25.4.1
--- SPECS/drbd.spec:1.90.4.25 Sun May 11 12:16:14 2008
+++ SPECS/drbd.spec Tue Sep 16 23:41:06 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 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}%{_alt_kernel}
Version: 0.7.25
-Release: %{_rel}
+Release: %{rel}
License: GPL
Group: Base/Kernel
Source0: http://oss.linbit.com/drbd/0.7/%{pname}-%{version}.tar.gz
@@ -41,7 +41,7 @@
BuildRequires: flex
%endif
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build}
-BuildRequires: rpmbuild(macros) >= 1.379
+BuildRequires: rpmbuild(macros) >= 1.452
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -83,9 +83,9 @@
%package -n kernel%{_alt_kernel}-block-drbd
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: [EMAIL PROTECTED]
+Release: [EMAIL PROTECTED]
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: drbdsetup
@@ -102,9 +102,9 @@
%package -n kernel%{_alt_kernel}-smp-block-drbd
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: [EMAIL PROTECTED]
+Release: [EMAIL PROTECTED]
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
Requires(post,postun): /sbin/depmod
Requires: drbdsetup
@@ -193,7 +193,6 @@
%groupremove haclient
fi
-
%if %{with userspace}
%files -n drbdsetup
%defattr(644,root,root,755)
@@ -227,6 +226,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.90.4.25.4.1 2008/09/16 21:41:06 glen
+- merge changes from LINUX_2_6_22 branch; rel 3 to rebuild with 2.6.16.62
kernel
+
Revision 1.90.4.25 2008/05/11 10:16:14 adamg
- restored 0.7.x on AC-branch
- drbd-8.x moved to drbd8.spec:AC-branch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/drbd.spec?r1=1.90.4.25&r2=1.90.4.25.4.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
