From e547db6a8beb5eae3c52162193e3a12dea88779d Mon Sep 17 00:00:00 2001 From: david hill Date: Sun, 15 May 2016 12:36:45 -0500 Subject: [PATCH] change release number format --- build/build_rpms | 5 +++-- build/columnstore.spec.in | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build/build_rpms b/build/build_rpms index f3df7d625..ea754432c 100755 --- a/build/build_rpms +++ b/build/build_rpms @@ -45,7 +45,7 @@ fi . ./build/releasenum # make the install package -buildroot=$HOME/rpm/BUILD/mariadb-columnstore-$version-$release +buildroot=$HOME/rpm/BUILD/mariadb-columnstore-$version.$release rm -rf $buildroot mkdir -p $buildroot @@ -113,7 +113,8 @@ sed -i -e "s/@@PACKAGER@@/Packager: $packager/" \ echo done. echo -n "Building rpms..." -rpmbuild -ba $HOME/rpm/SPECS/columnstore.spec >/tmp/rpmbuild.out.$$ 2>&1 + +rpmbuild -ba $HOME/rpm/SPECS/columnstore.spec > /tmp/rpmbuild.out.$$ 2>&1 rc=$? echo done. if [ $verbose -gt 0 -o $rc -ne 0 ]; then diff --git a/build/columnstore.spec.in b/build/columnstore.spec.in index 0e397b507..3fb25e3e1 100644 --- a/build/columnstore.spec.in +++ b/build/columnstore.spec.in @@ -10,7 +10,7 @@ URL: http://www.mariadb.com/ @@PACKAGER@@ Group: Applications License: Copyright (c) 2016 MariaDB, Inc., all rights reserved; redistributable under the terms of the GPL, see the file COPYING for details. -BuildRoot: %{_tmppath}/%{name}-%{release}-buildroot +BuildRoot: %{_tmppath}/%{name}.%{release}-buildroot %description MariaDB-Columnstore software meta-package @@ -58,10 +58,10 @@ MariaDB Columnstore connector binary files %install mkdir -p %{buildroot}/usr/local -tar -C $RPM_BUILD_DIR/%{name}-%{version}-%{release} -cf - . | tar -C %{buildroot}/usr/local -xf - +tar -C $RPM_BUILD_DIR/%{name}-%{version}.%{release} -cf - . | tar -C %{buildroot}/usr/local -xf - %clean -rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}-%{release} +rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}.%{release} %changelog