Merge pull request EOSIO#6362 from EOSIO/fix-build-scripts

Pull in changes to build scripts that were merged to develop
eosiosg · Nov 20, 2018 · 131b193 · 131b193
2 parents 0815a5f + dc87af4
commit 131b193
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/scripts/generate_bottle.sh b/scripts/generate_bottle.sh
@@ -3,7 +3,7 @@
 VERS=`sw_vers -productVersion | awk '/10\.13\..*/{print $0}'`
 if [[ -z "$VERS" ]];
 then
-   VERS=`sw_vers -productVersion | awk '/10\.14\..*/{print $0}'`
+   VERS=`sw_vers -productVersion | awk '/10\.14.*/{print $0}'`
    if [[ -z "$VERS" ]];
    then
       echo "Error, unsupported OS X version"

diff --git a/scripts/generate_deb.sh b/scripts/generate_deb.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-NAME="${PROJECT}-${VERSION}.x86_64"
+NAME="${PROJECT}_${VERSION}-1_amd64"
 PREFIX="usr"
 SPREFIX=${PREFIX}
 SUBPREFIX="opt/${PROJECT}/${VERSION}"

diff --git a/scripts/generate_rpm.sh b/scripts/generate_rpm.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-NAME="${PROJECT}-${VERSION}.x86_64"
+NAME="${PROJECT}-${VERSION}-1"
 PREFIX="usr"
 SPREFIX=${PREFIX}
 SUBPREFIX="opt/${PROJECT}/${VERSION}"
@@ -13,7 +13,7 @@ export SSUBPREFIX
 
 bash generate_tarball.sh ${NAME}.tar.gz
 
-RPMBUILD=`realpath ~/rpmbuild/BUILDROOT/${NAME}-0.x86_64`
+RPMBUILD=`realpath ~/rpmbuild/BUILDROOT/${NAME}.x86_64`
 mkdir -p ${RPMBUILD} 
 FILES=$(tar -xvzf ${NAME}.tar.gz -C ${RPMBUILD})
 PFILES=""
@@ -26,15 +26,15 @@ echo -e ${PFILES} &> ~/rpmbuild/BUILD/filenames.txt
 
 mkdir -p ${PROJECT} 
 echo -e "Name: ${PROJECT} 
-Version: ${VERSION}.x86_64
+Version: ${VERSION}
 License: MIT
 Vendor: ${VENDOR} 
 Source: ${URL} 
 Requires: openssl-devel.x86_64, gmp-devel.x86_64, libstdc++-devel.x86_64, bzip2.x86_64, bzip2-devel.x86_64, mongodb.x86_64, mongodb-server.x86_64
 URL: ${URL} 
 Packager: ${VENDOR} <${EMAIL}>
 Summary: ${DESC}
-Release: 0
+Release: 1
 %description
 ${DESC}
 %files -f filenames.txt" &> ${PROJECT}.spec