From 851067be517127d40a5197b4c74bb40082a496a1 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Mon, 2 Nov 2015 11:52:28 +0800
Subject: [PATCH] conda: consistent version numbering

---
 conda/misoc/meta.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/conda/misoc/meta.yaml b/conda/misoc/meta.yaml
index 74eff0208..c74933bb4 100644
--- a/conda/misoc/meta.yaml
+++ b/conda/misoc/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: misoc
-  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.{{ environ.get("GIT_DESCRIBE_HASH") }}
+  version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}
 
 source:
   git_url: https://github.com/m-labs/misoc
@@ -8,7 +8,8 @@ source:
 
 build:
   noarch_python: true
-  string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+  number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+  string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }}
   script: $PYTHON setup.py install
 
 requirements: