From aa6bfeb9d6a3a635e7e62cae754ba91be1370586 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Mon, 19 Feb 2018 14:23:14 +0100 Subject: [PATCH] scripts: fill in VERSION for all distro files --- .gitlab-ci.yml | 2 +- scripts/{make-spec.sh => make-distrofiles.sh} | 3 ++- scripts/make-srpm.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename scripts/{make-spec.sh => make-distrofiles.sh} (67%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8501465da..1620e4ac8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -353,7 +353,7 @@ obs: dependencies: [] script: - scripts/make-archive.sh - - scripts/make-spec.sh + - scripts/make-distrofiles.sh - echo -e "[general]\napiurl = https://api.opensuse.org\n\n[https://api.opensuse.org]\nuser = CZ-NIC\npass = $OBS_PASSWORD" > /root/.oscrc - osc co home:CZ-NIC:knot-devel knot-resolver - cd home\:CZ-NIC\:knot-devel/knot-resolver/ diff --git a/scripts/make-spec.sh b/scripts/make-distrofiles.sh similarity index 67% rename from scripts/make-spec.sh rename to scripts/make-distrofiles.sh index cf0a01729..e0d358458 100755 --- a/scripts/make-spec.sh +++ b/scripts/make-distrofiles.sh @@ -1,7 +1,8 @@ #!/bin/bash -e -# Fill in VERSION field in Fedora spec file +# Fill in VERSION field in distribution specific files cd "$(git rev-parse --show-toplevel)" VERSION=$(scripts/show-version.sh | sed 's/knot-resolver-\(.*\).tar.xz/\1/') sed -i.bak "s@%define VERSION .*@%define VERSION $VERSION@" distro/fedora/knot-resolver.spec +sed -i.bak "s/VERSION/$VERSION/" distro/arch/PKGBUILD diff --git a/scripts/make-srpm.sh b/scripts/make-srpm.sh index f8691cffd..588583042 100755 --- a/scripts/make-srpm.sh +++ b/scripts/make-srpm.sh @@ -4,7 +4,7 @@ cd "$(git rev-parse --show-toplevel)" scripts/make-archive.sh -scripts/make-spec.sh +scripts/make-distrofiles.sh mv knot-resolver-*.tar.xz distro/fedora/ cd distro/fedora rpkg srpm -- 2.47.3