From bb4b062e1fe52c35c5a216bce4a80f9e4ffef445 Mon Sep 17 00:00:00 2001
From: Manuel Domke <manuel-domke@gmx.org>
Date: Thu, 1 Mar 2018 23:29:34 +0100
Subject: [PATCH] fixed archlinux and rpm builds

---
 software/build-scripts/build-archlinux.sh | 4 +++-
 software/build-scripts/build-rpm.sh       | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/software/build-scripts/build-archlinux.sh b/software/build-scripts/build-archlinux.sh
index e5f8b65..80ddf9c 100755
--- a/software/build-scripts/build-archlinux.sh
+++ b/software/build-scripts/build-archlinux.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-VERSION=`git --no-pager describe --tags --always`
+VERSION=`git --no-pager describe --tags --always | cut -d'-' -f0`
+PKGREL=`git --no-pager describe --tags --always | cut -d'-' -f1`
 
 # x86_64
 mkdir -p x86_64
@@ -9,6 +10,7 @@ cd x86_64
 cp ../build-scripts/PKGBUILD.arch PKGBUILD
 cp ../build-scripts/INSTALL.arch INSTALL
 echo "pkgver=$VERSION" >> PKGBUILD
+echo "pkgrel=$PKGREL" >> PKGBUILD
 echo "arch=('x86_64')" >> PKGBUILD
 ls -lah
 makepkg -f --sign --key 975DC25C4E730A3C
diff --git a/software/build-scripts/build-rpm.sh b/software/build-scripts/build-rpm.sh
index 5feedeb..3886bae 100755
--- a/software/build-scripts/build-rpm.sh
+++ b/software/build-scripts/build-rpm.sh
@@ -1,10 +1,10 @@
-VERSION=$1
+VERSION=`git --no-pager describe --tags --always`
 ARCH=$2
 
 PATH=$PATH:/sbin/
 
 mkdir -p SOURCES
-tar -czf SOURCES/infnoise.tar.gz . --exclude="*.sh" --exclude="SOURCES"
+tar -czf SOURCES/infnoise.tar.gz . --exclude="SOURCES"
 
 mkdir -p BUILD SPECS RPMS SRPMS