conda: consistent version numbering

diff --git a/conda/misoc/meta.yaml b/conda/misoc/meta.yaml
index 74eff020854a4d1b5b39763f2d3ba913c1f3f939..c74933bb4405be859a7493e579ad3963bb7d57eb 100644 (file)
--- 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: