diff --git a/confluent_client/confluent_client.spec.tmpl b/confluent_client/confluent_client.spec.tmpl index ee786175..ca2d0b92 100644 --- a/confluent_client/confluent_client.spec.tmpl +++ b/confluent_client/confluent_client.spec.tmpl @@ -1,7 +1,7 @@ %define name confluent_client %define version #VERSION# %define fversion %{lua: -sv, _ = string.gsub("#VERSION#", "[~+]", "-") +sv, _ = string.gsub("#VERSION#", "[~]", "-") print(sv) } %define release 1 diff --git a/confluent_server/confluent_server.spec.tmpl b/confluent_server/confluent_server.spec.tmpl index 1fb62d71..83f3452b 100644 --- a/confluent_server/confluent_server.spec.tmpl +++ b/confluent_server/confluent_server.spec.tmpl @@ -1,7 +1,7 @@ %define name confluent_server %define version #VERSION# %define fversion %{lua: -sv, _ = string.gsub("#VERSION#", "[~+]", "-") +sv, _ = string.gsub("#VERSION#", "[~]", "-") print(sv) } %define release 1 diff --git a/confluent_server/makesetup b/confluent_server/makesetup index a34438d3..33b08654 100755 --- a/confluent_server/makesetup +++ b/confluent_server/makesetup @@ -6,7 +6,7 @@ if [ "$NUMCOMMITS" != "$VERSION" ]; then LASTNUM=$((LASTNUM+1)) FIRSTPART=$(echo $VERSION|rev|cut -d . -f 2- |rev) VERSION=${FIRSTPART}.${LASTNUM} - VERSION=$VERSION~dev$NUMCOMMITS+`git describe|cut -d- -f 3` + VERSION=$VERSION.dev$NUMCOMMITS+`git describe|cut -d- -f 3` fi echo $VERSION > VERSION sed -e "s/#VERSION#/$VERSION/" setup.py.tmpl > setup.py