BUILD RPM: revert dist token in Release tag, reset dist to nil when building src.rpm
This commit was SVN r32224.
Этот коммит содержится в:
родитель
d55f16db50
Коммит
8c265fab15
contrib/dist/linux
1
contrib/dist/linux/buildrpm.sh
поставляемый
1
contrib/dist/linux/buildrpm.sh
поставляемый
@ -212,6 +212,7 @@ fi
|
|||||||
|
|
||||||
if test "$build_srpm" = "yes"; then
|
if test "$build_srpm" = "yes"; then
|
||||||
echo "--> Building the Open MPI SRPM"
|
echo "--> Building the Open MPI SRPM"
|
||||||
|
rpmbuild_options="$rpmbuild_options --define 'dist %{nil}'"
|
||||||
cmd="$rpm_cmd $rpmbuild_options -bs $specdest"
|
cmd="$rpm_cmd $rpmbuild_options -bs $specdest"
|
||||||
echo "--> $cmd"
|
echo "--> $cmd"
|
||||||
eval $cmd
|
eval $cmd
|
||||||
|
2
contrib/dist/linux/openmpi.spec
поставляемый
2
contrib/dist/linux/openmpi.spec
поставляемый
@ -203,7 +203,7 @@
|
|||||||
Summary: A powerful implementation of MPI/SHMEM
|
Summary: A powerful implementation of MPI/SHMEM
|
||||||
Name: %{?_name:%{_name}}%{!?_name:openmpi}
|
Name: %{?_name:%{_name}}%{!?_name:openmpi}
|
||||||
Version: $VERSION
|
Version: $VERSION
|
||||||
Release: 1
|
Release: 1%{?dist}
|
||||||
License: BSD
|
License: BSD
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Source: openmpi-%{version}.tar.$EXTENSION
|
Source: openmpi-%{version}.tar.$EXTENSION
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user