[ofa-general] [PATCH] management: Fixed custom_release in SPEC files

Nicolas Morey-Chaisemartin nicolas.morey-chaisemartin at ext.bull.net
Mon Apr 27 03:59:05 PDT 2009


Removed a space which make rpmbuild fail when _dist and CUSTOM_RELEASE are set:
error: line 15: Tag takes single token only: Release: ofed1.4.1 .fc11

This is due to 
Release: %rel%{?dist}
and %rel having a trailing whitespace.

Signed-off-by: Nicolas Morey-Chaisemartin <nicolas.morey-chaisemartin at ext.bull.net>
---
 infiniband-diags/infiniband-diags.spec.in |    2 +-
 libibmad/libibmad.spec.in                 |    2 +-
 libibumad/libibumad.spec.in               |    2 +-
 opensm/opensm.spec.in                     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/infiniband-diags/infiniband-diags.spec.in b/infiniband-diags/infiniband-diags.spec.in
index 3791eb4..4bbd907 100644
--- a/infiniband-diags/infiniband-diags.spec.in
+++ b/infiniband-diags/infiniband-diags.spec.in
@@ -1,6 +1,6 @@
 
 %define RELEASE @RELEASE@
-%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
+%define rel %{?CUSTOM_RELEASE}%{!?CUSTOM_RELEASE:%RELEASE}
 
 Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools
 Name: infiniband-diags
diff --git a/libibmad/libibmad.spec.in b/libibmad/libibmad.spec.in
index 5fd10f6..1b556aa 100644
--- a/libibmad/libibmad.spec.in
+++ b/libibmad/libibmad.spec.in
@@ -1,6 +1,6 @@
 
 %define RELEASE @RELEASE@
-%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
+%define rel %{?CUSTOM_RELEASE}%{!?CUSTOM_RELEASE:%RELEASE}
 
 Summary: OpenFabrics Alliance InfiniBand MAD library
 Name: libibmad
diff --git a/libibumad/libibumad.spec.in b/libibumad/libibumad.spec.in
index 7732edd..b01757f 100644
--- a/libibumad/libibumad.spec.in
+++ b/libibumad/libibumad.spec.in
@@ -1,6 +1,6 @@
 
 %define RELEASE @RELEASE@
-%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
+%define rel %{?CUSTOM_RELEASE}%{!?CUSTOM_RELEASE:%RELEASE}
 
 Summary: OpenFabrics Alliance InfiniBand umad (user MAD) library
 Name: libibumad
diff --git a/opensm/opensm.spec.in b/opensm/opensm.spec.in
index 7b82faf..3c89c34 100644
--- a/opensm/opensm.spec.in
+++ b/opensm/opensm.spec.in
@@ -1,5 +1,5 @@
 %define RELEASE @RELEASE@
-%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
+%define rel %{?CUSTOM_RELEASE}%{!?CUSTOM_RELEASE:%RELEASE}
 %if %{?_with_console_socket:1}%{!?_with_console_socket:0}
 %define _enable_console_socket --enable-console-socket
 %endif
-- 
1.6.2.GIT




More information about the general mailing list