From 8c265fab15ddada7e92336ae7baa7101ebd984f0 Mon Sep 17 00:00:00 2001
From: Mike Dubman <miked@mellanox.com>
Date: Sat, 12 Jul 2014 12:29:30 +0000
Subject: [PATCH] BUILD RPM: revert dist token in Release tag, reset dist to
 nil when building src.rpm

This commit was SVN r32224.
---
 contrib/dist/linux/buildrpm.sh  | 1 +
 contrib/dist/linux/openmpi.spec | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/dist/linux/buildrpm.sh b/contrib/dist/linux/buildrpm.sh
index 09c23ed829..c3ab6ac2ab 100755
--- a/contrib/dist/linux/buildrpm.sh
+++ b/contrib/dist/linux/buildrpm.sh
@@ -212,6 +212,7 @@ fi
 
 if test "$build_srpm" = "yes"; then
     echo "--> Building the Open MPI SRPM"
+    rpmbuild_options="$rpmbuild_options --define 'dist %{nil}'"
     cmd="$rpm_cmd $rpmbuild_options -bs $specdest"
     echo "--> $cmd"
     eval $cmd
diff --git a/contrib/dist/linux/openmpi.spec b/contrib/dist/linux/openmpi.spec
index 4d043bd1bd..d505be6155 100644
--- a/contrib/dist/linux/openmpi.spec
+++ b/contrib/dist/linux/openmpi.spec
@@ -203,7 +203,7 @@
 Summary: A powerful implementation of MPI/SHMEM
 Name: %{?_name:%{_name}}%{!?_name:openmpi}
 Version: $VERSION
-Release: 1
+Release: 1%{?dist}
 License: BSD
 Group: Development/Libraries
 Source: openmpi-%{version}.tar.$EXTENSION