From cf1d884ffa45b342f38a78189bbd86186ce6cbfe Mon Sep 17 00:00:00 2001 From: baude Date: Sat, 21 Apr 2018 10:08:18 -0500 Subject: Add seconds after epoch to copr rpms to tie break versioning Signed-off-by: baude Closes: #654 Approved by: mheon --- .copr/prepare.sh | 2 +- contrib/spec/podman.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.copr/prepare.sh b/.copr/prepare.sh index d33d55dc7..8d30b9755 100644 --- a/.copr/prepare.sh +++ b/.copr/prepare.sh @@ -10,7 +10,7 @@ git fetch --unshallow || : COMMIT=$(git rev-parse HEAD) COMMIT_SHORT=$(git rev-parse --short HEAD) COMMIT_NUM=$(git rev-list HEAD --count) -COMMIT_DATE=$(date --date="@$(git show -s --format=%ct HEAD)" +%Y%m%d) +COMMIT_DATE=$(date +%s) sed "s,#COMMIT#,${COMMIT},; s,#SHORTCOMMIT#,${COMMIT_SHORT},; diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index b78c5b60e..6a3199a9e 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -44,7 +44,7 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: podman -Version: 0.4.4 +Version: 0.4.4.#COMMITDATE# Release: git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 -- cgit v1.2.3-54-g00ecf