diff --git a/dist/rpm/VERSION b/dist/rpm/VERSION index 326a83b..9af9985 100644 --- a/dist/rpm/VERSION +++ b/dist/rpm/VERSION @@ -1,4 +1,4 @@ VERSION=0.9.8 -BUILD_NUMBER=1064 -GIT_HASH=ac868b317d5348124db1a506b0a32a1c30ba7ea6 +BUILD_NUMBER=1067 +GIT_HASH=581a2014b2f11a7b2d0fa2de9e8b30dbacdb266f GIT_BRANCH=develop diff --git a/dist/rpm/gnome/_service b/dist/rpm/gnome/_service index 16cffd9..f56678f 100644 --- a/dist/rpm/gnome/_service +++ b/dist/rpm/gnome/_service @@ -2,7 +2,7 @@ https://github.com/Ximi1970/systray-x.git git - 0.9.8 + release-0.9.8 0.9.8 systray-x-gnome dist/rpm/gnome/systray-x-gnome.changes diff --git a/dist/rpm/kde/_service b/dist/rpm/kde/_service index 98f3604..b99815b 100644 --- a/dist/rpm/kde/_service +++ b/dist/rpm/kde/_service @@ -2,7 +2,7 @@ https://github.com/Ximi1970/systray-x.git git - 0.9.8 + release-0.9.8 0.9.8 dist/rpm/kde/systray-x.changes dist/rpm/kde/systray-x.spec diff --git a/dist/rpm/minimal/_service b/dist/rpm/minimal/_service index 7f26468..bcf4a3b 100644 --- a/dist/rpm/minimal/_service +++ b/dist/rpm/minimal/_service @@ -2,7 +2,7 @@ https://github.com/Ximi1970/systray-x.git git - 0.9.8 + release-0.9.8 0.9.8 systray-x-minimal dist/rpm/minimal/systray-x-minimal.changes diff --git a/update_version.sh b/update_version.sh index cd4145d..dcbbea1 100755 --- a/update_version.sh +++ b/update_version.sh @@ -1,49 +1,60 @@ #!/bin/bash +if [[ -z $2 ]] ; then + RELEASE=1 +else + RELEASE=$2 +fi + VERSION=$1 +echo $VERSION-$RELEASE + VERSION_AR=(${VERSION//./ }) VERSION_MAJOR=${VERSION_AR[0]} VERSION_MINOR=${VERSION_AR[1]} VERSION_BUILD=${VERSION_AR[2]} SERVICE_FILE="./dist/rpm/kde/_service" -sed -i -e "s?\(^.*\"revision\">\).*\(\)?\1$VERSION\2?" $SERVICE_FILE +sed -i -e "s?\(^.*\"revision\">\).*\(\)?\1release-$VERSION\2?" $SERVICE_FILE sed -i -e "s?\(^.*\"versionformat\">\).*\(\)?\1$VERSION\2?" $SERVICE_FILE SERVICE_FILE="./dist/rpm/gnome/_service" -sed -i -e "s?\(^.*\"revision\">\).*\(\)?\1$VERSION\2?" $SERVICE_FILE +sed -i -e "s?\(^.*\"revision\">\).*\(\)?\1release-$VERSION\2?" $SERVICE_FILE sed -i -e "s?\(^.*\"versionformat\">\).*\(\)?\1$VERSION\2?" $SERVICE_FILE SERVICE_FILE="./dist/rpm/minimal/_service" -sed -i -e "s?\(^.*\"revision\">\).*\(\)?\1$VERSION\2?" $SERVICE_FILE +sed -i -e "s?\(^.*\"revision\">\).*\(\)?\1release-$VERSION\2?" $SERVICE_FILE sed -i -e "s?\(^.*\"versionformat\">\).*\(\)?\1$VERSION\2?" $SERVICE_FILE SERVICE_FILE="./dist/deb/kde/debian.changelog" -sed -i -e "0,/systray-x/{s?\(^systray-x \).*\( unstable.*\)?\1($VERSION-1)\2?}" $SERVICE_FILE +sed -i -e "0,/systray-x/{s?\(^systray-x \).*\( unstable.*\)?\1($VERSION-$RELEASE)\2?}" $SERVICE_FILE SERVICE_FILE="./dist/deb/kde/systray-x.dsc" -sed -i -e "s?\(^Version: \).*?\1$VERSION-1?" $SERVICE_FILE +sed -i -e "s?\(^Version: \).*?\1$VERSION-$RELEASE?" $SERVICE_FILE SERVICE_FILE="./dist/deb/gnome/debian.changelog" -sed -i -e "0,/systray-x/{s?\(^systray-x-gnome \).*\( unstable.*\)?\1($VERSION-1)\2?}" $SERVICE_FILE +sed -i -e "0,/systray-x/{s?\(^systray-x-gnome \).*\( unstable.*\)?\1($VERSION-$RELEASE)\2?}" $SERVICE_FILE SERVICE_FILE="./dist/deb/gnome/systray-x-gnome.dsc" -sed -i -e "s?\(^Version: \).*?\1$VERSION-1?" $SERVICE_FILE +sed -i -e "s?\(^Version: \).*?\1$VERSION-$RELEASE?" $SERVICE_FILE SERVICE_FILE="./dist/deb/minimal/debian.changelog" -sed -i -e "0,/systray-x/{s?\(^systray-x-minimal \).*\( unstable.*\)?\1($VERSION-1)\2?}" $SERVICE_FILE +sed -i -e "0,/systray-x/{s?\(^systray-x-minimal \).*\( unstable.*\)?\1($VERSION-$RELEASE)\2?}" $SERVICE_FILE SERVICE_FILE="./dist/deb/minimal/systray-x-minimal.dsc" -sed -i -e "s?\(^Version: \).*?\1$VERSION-1?" $SERVICE_FILE +sed -i -e "s?\(^Version: \).*?\1$VERSION-$RELEASE?" $SERVICE_FILE SERVICE_FILE="./dist/arch/kde/PKGBUILD" sed -i -e "s?\(^pkgver=\).*?\1$VERSION?" $SERVICE_FILE +sed -i -e "s?\(^pkgrel=\).*?\1$RELEASE?" $SERVICE_FILE SERVICE_FILE="./dist/arch/gnome/PKGBUILD" sed -i -e "s?\(^pkgver=\).*?\1$VERSION?" $SERVICE_FILE +sed -i -e "s?\(^pkgrel=\).*?\1$RELEASE?" $SERVICE_FILE SERVICE_FILE="./dist/arch/minimal/PKGBUILD" sed -i -e "s?\(^pkgver=\).*?\1$VERSION?" $SERVICE_FILE +sed -i -e "s?\(^pkgrel=\).*?\1$RELEASE?" $SERVICE_FILE MANIFEST_FILE="./webext/manifest.json"