rpms/drbd/devel drbd.spec,1.1,1.2
Philipp Reisner
reisner at fedoraproject.org
Tue Nov 24 15:49:09 UTC 2009
- Previous message: File glibc-2.11-44-g49c7f27.tar.bz2 uploaded to lookaside cache by schwab
- Next message: rpms/glibc/devel .cvsignore, 1.292, 1.293 glibc-fedora.patch, 1.326, 1.327 glibc.spec, 1.419, 1.420 import.log, 1.35, 1.36 sources, 1.317, 1.318
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: reisner
Update of /cvs/pkgs/rpms/drbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26255
Modified Files:
drbd.spec
Log Message:
Do not build the drbd-xen package on non x86 architectures.
Index: drbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drbd/devel/drbd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drbd.spec 11 Nov 2009 16:10:05 -0000 1.1
+++ drbd.spec 24 Nov 2009 15:49:08 -0000 1.2
@@ -3,20 +3,25 @@
# autoconf...
%{!?_initddir: %{expand: %%global _initddir %{_initrddir}}}
-# Conditionals -- invoke "rpmbuild --without <feature>" to disable
-# specific features
-# note: conditionals may not contain "-" nor "_", hence "bashcompletion"
-%bcond_without xen
+# Conditionals
+# Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
+# to disable or enable specific features
%bcond_without udev
%bcond_without pacemaker
%bcond_with rgmanager
%bcond_without heartbeat
+# conditionals may not contain "-" nor "_", hence "bashcompletion"
%bcond_without bashcompletion
+# --with xen is ignored on any non-x86 architecture
+%bcond_without xen
+%ifnarch %{ix86} x86_64
+%global _without_xen --without-xen
+%endif
Name: drbd
Summary: DRBD driver for Linux
Version: 8.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Source: http://oss.linbit.com/%{name}/8.3/%{name}-%{version}.tar.gz
License: GPLv2+
ExclusiveOS: linux
@@ -28,9 +33,11 @@ BuildRequires: flex
BuildRequires: udev
%endif
Requires: %{name}-utils = %{version}
+%ifarch %{ix86} x86_64
%if %{with xen}
Requires: %{name}-xen = %{version}
%endif
+%endif
%if %{with pacemaker}
Requires: %{name}-pacemaker = %{version}
%endif
@@ -107,6 +114,7 @@ This packages includes the DRBD administ
%doc ChangeLog
%doc README
+%ifarch %{ix86} x86_64
%if %{with xen}
%package xen
Summary: Xen block device management script for DRBD
@@ -122,6 +130,7 @@ promoting and demoting DRBD resources as
%defattr(755,root,root,-)
%{_sysconfdir}/xen/scripts/block-drbd
%endif # with xen
+%endif # arch %{ix86} x86_64
%if %{with udev}
%package udev
@@ -267,6 +276,9 @@ fi
%changelog
+* Thu Nov 8 2009 Philipp Reisner <phil at linbit.com> - 8.3.6-2
+- Do not build the drbd-xen package on non x86 architectures.
+
* Thu Nov 8 2009 Philipp Reisner <phil at linbit.com> - 8.3.6-1
- New upstream release.
- Previous message: File glibc-2.11-44-g49c7f27.tar.bz2 uploaded to lookaside cache by schwab
- Next message: rpms/glibc/devel .cvsignore, 1.292, 1.293 glibc-fedora.patch, 1.326, 1.327 glibc.spec, 1.419, 1.420 import.log, 1.35, 1.36 sources, 1.317, 1.318
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list