From c87e1ef525c32d6881bab14fd3bae37ddaf1c96f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 7 Jul 2016 11:19:26 +0200 Subject: [PATCH] contrib/rpm: fix %{snap} define to have snapshot before git-sha In case, where both %global snapshot git20160606 %global git_sha b769b4df is set, they version number should be .git20160606.b769b4df not .b769b4df.git20160606 --- contrib/fedora/rpm/NetworkManager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 73cf3704fc..914faf4a72 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -37,7 +37,7 @@ %global git_sha_dot .%{git_sha} %endif -%global snap %{?git_sha_dot}%{?snapshot_dot} +%global snap %{?snapshot_dot}%{?git_sha_dot} ###############################################################################