From b428787161f7c759c70c081621ffe43f24ca73b1 Mon Sep 17 00:00:00 2001 From: Manuel Domke Date: Thu, 1 Mar 2018 23:43:26 +0100 Subject: [PATCH] fixed release attributes of rpms and archlinux --- software/build-scripts/build-archlinux.sh | 4 ++++ software/build-scripts/build-rpm.sh | 11 ++++++++++- software/build-scripts/infnoise.spec | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/software/build-scripts/build-archlinux.sh b/software/build-scripts/build-archlinux.sh index 402ff39..b7aa059 100755 --- a/software/build-scripts/build-archlinux.sh +++ b/software/build-scripts/build-archlinux.sh @@ -3,6 +3,10 @@ VERSION=`git --no-pager describe --tags --always | cut -d'-' -f1` PKGREL=`git --no-pager describe --tags --always | cut -d'-' -f2` +if [ $VERSION == $PKGREL ]; then # this is a release + PKGREL=0 +fi + # x86_64 mkdir -p x86_64 cd x86_64 diff --git a/software/build-scripts/build-rpm.sh b/software/build-scripts/build-rpm.sh index af7b348..c24448f 100755 --- a/software/build-scripts/build-rpm.sh +++ b/software/build-scripts/build-rpm.sh @@ -1,4 +1,12 @@ -VERSION=`git --no-pager describe --tags --always` +#!/bin/bash + +VERSION=`git --no-pager describe --tags --always | cut -d'-' -f1` +RELEASE=`git --no-pager describe --tags --always | cut -d'-' -f2` + +if [ $VERSION == $RELEASE ]; then # this is a release + RELEASE=0 +fi + ARCH=$2 PATH=$PATH:/sbin/ @@ -10,6 +18,7 @@ mkdir -p BUILD SPECS RPMS SRPMS cp build-scripts/infnoise.spec SPECS sed -i -- 's/__VERSION__/'$VERSION'/g' SPECS/infnoise.spec +sed -i -- 's/__RELEASE__/'$RELEASE'/g' SPECS/infnoise.spec rpmbuild --define "_topdir `pwd`" -ba SPECS/infnoise.spec diff --git a/software/build-scripts/infnoise.spec b/software/build-scripts/infnoise.spec index 8d6e539..80a0296 100644 --- a/software/build-scripts/infnoise.spec +++ b/software/build-scripts/infnoise.spec @@ -1,6 +1,6 @@ Name: infnoise Version: __VERSION__ -Release: 0 +Release: __RELEASE__ Summary: Infinite Noise TRNG Group: Applications/Security License: GPL