diff --git a/.addon-context-linux.metadata b/.addon-context-linux.metadata index 3d63458..b8caffe 100644 --- a/.addon-context-linux.metadata +++ b/.addon-context-linux.metadata @@ -1 +1 @@ -0fb6c583ecb9d6aff73534f8c025eef2cec2a830 SOURCES/addon-context-linux-6.6.0.tar.gz +78b762c1895faa659a4f25a903778ce4a5c3d086 SOURCES/addon-context-linux-6.6.0.tar.gz diff --git a/SOURCES/addon-context-linux-srpmbuild.patch b/SOURCES/addon-context-linux-generate.patch similarity index 73% rename from SOURCES/addon-context-linux-srpmbuild.patch rename to SOURCES/addon-context-linux-generate.patch index 176655a..da72f1e 100644 --- a/SOURCES/addon-context-linux-srpmbuild.patch +++ b/SOURCES/addon-context-linux-generate.patch @@ -1,7 +1,21 @@ diff --git a/generate.sh b/generate.sh -index c9e3b82..1ada8e4 100755 +index c9e3b82..413aec2 100755 --- a/generate.sh +++ b/generate.sh +@@ -30,11 +30,11 @@ set +e + ### + + if [ -z "${RELEASE}" ]; then +- if git describe --contains "$(git rev-parse HEAD)" &>/dev/null; then ++ if true; then + RELEASE=1 + else + DATE=${DATE:-$(date +%Y%m%d)} +- GIT=$(git rev-parse --short HEAD) ++ GIT= + RELEASE="0.${DATE}git${GIT}" + fi + fi @@ -85,7 +85,6 @@ fi set -e diff --git a/SPECS/one-context.spec b/SPECS/one-context.spec index 4551301..c4a17b5 100644 --- a/SPECS/one-context.spec +++ b/SPECS/one-context.spec @@ -16,7 +16,7 @@ URL: http://opennebula.org Packager: MSVSphere Source: https://github.com/OpenNebula/%{name}/archive/refs/tags/addon-context-linux-%{version}.tar.gz Patch1: addon-context-linux-msvsphere.patch -Patch2: addon-context-linux-srpmbuild.patch +Patch2: addon-context-linux-generate.patch Requires: util-linux Requires: bash