Fix remaining tilde usages in version fallback and RPM packaging

Co-authored-by: Flole998 <9951871+Flole998@users.noreply.github.com>

diff --git a/rpm/Makefile b/rpm/Makefile
index 8e1042d2d9ce82acd969c284afd0028bfc0f8150..e9116986b5b7514a33ac89c5f4385df76574cec2 100644 (file)
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -26,7 +26,7 @@ COMMIT   ?= $(shell git rev-parse HEAD)
 COMMIT1   = $(shell git rev-parse $(COMMIT))
 FVERSION  = $(shell cd .. && git describe --match "v*" $(COMMIT1) | sed "s/^v//")
 VERSION   = $(shell echo "$(FVERSION)" | cut -d '-' -f 1)
-RELEASE   = $(shell echo "$(FVERSION)" | cut -d '-' -f 2-10 | sed "s/-/~/g")
+RELEASE   = $(shell echo "$(FVERSION)" | cut -d '-' -f 2-10)
 VERSION  ?= "0.0.0"
 RELEASE  ?= 1
 ifeq ($(VERSION),$(RELEASE))

diff --git a/support/version b/support/version
index 90b84205014d4dbb31f679bef5033da64614641f..f0f7ef5925c2402df16df9dd12aef50a4a67b6e4 100755 (executable)
--- a/support/version
+++ b/support/version
@@ -25,7 +25,7 @@ else
   VER=$(basename $(realpath $(dirname "$0")/..) | sed -e 's/^tvheadend-//' | sed -e 's/^tvheadend-v//')
   case $VER in
   [1-9]*\.[0-9]*) ;;
-  *) VER="0.0.0~unknown" ;;
+  *) VER="0.0.0-unknown" ;;
   esac
 fi