SPECS (DEVEL): drbd.spec - bconds up, smp removed, package smp rem...
zbyniu
zbyniu at pld-linux.org
Sat Apr 7 23:18:07 CEST 2007
Author: zbyniu Date: Sat Apr 7 21:18:07 2007 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- bconds up, smp removed, package smp removed
---- Files affected:
SPECS:
drbd.spec (1.90.2.3 -> 1.90.2.4)
---- Diffs:
================================================================
Index: SPECS/drbd.spec
diff -u SPECS/drbd.spec:1.90.2.3 SPECS/drbd.spec:1.90.2.4
--- SPECS/drbd.spec:1.90.2.3 Thu Apr 5 15:02:54 2007
+++ SPECS/drbd.spec Sat Apr 7 23:18:01 2007
@@ -3,8 +3,6 @@
# 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
@@ -13,10 +11,6 @@
%define alt_kernel grsecurity
%endif
#
-%ifarch sparc
-%undefine with_smp
-%endif
-
%define _rel 1
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
@@ -34,7 +28,7 @@
BuildRequires: flex
%endif
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build}
-BuildRequires: rpmbuild(macros) >= 1.330
+BuildRequires: rpmbuild(macros) >= 1.379
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -74,7 +68,7 @@
Summary(pl.UTF-8): ModuĹ 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_up}
+%{?with_dist_kernel:%requires_releq_kernel}
Requires(post,postun): /sbin/depmod
Requires: drbdsetup
@@ -88,25 +82,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-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: %{_rel}@%{_kernel_ver_str}
-Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun): /sbin/depmod
-Requires: drbdsetup
-
-%description -n kernel%{_alt_kernel}-smp-block-drbd
-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-drbd -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
%patch0 -p1
@@ -157,12 +132,6 @@
%postun -n kernel%{_alt_kernel}-block-drbd
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-block-drbd
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-block-drbd
-%depmod %{_kernel_ver}smp
-
%post -n drbdsetup
/sbin/chkconfig --add drbd
%service drbd restart
@@ -188,13 +157,6 @@
%defattr(644,root,root,755)
%doc ChangeLog README
/lib/modules/%{_kernel_ver}/block/drbd.ko*
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-block-drbd
-%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"`)
@@ -203,6 +165,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.90.2.4 2007/04/07 21:18:01 zbyniu
+- bconds up, smp removed, package smp removed
+
Revision 1.90.2.3 2007/04/05 13:02:54 zbyniu
- up to 8.0.1; up bcond; s/misc/block/
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/drbd.spec?r1=1.90.2.3&r2=1.90.2.4&f=u
More information about the pld-cvs-commit
mailing list