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

@@ -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

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