From 91cffb082d640f1a1818384eee10dc9a1327637c Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Mon, 18 Feb 2019 10:59:48 +0100
Subject: [PATCH 1/2] [conda] Try to use cp instead of install for doc-dir
installation
---
conda/meta.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 8691b6f..59dd165 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -19,7 +19,7 @@ build:
- install -d ${PREFIX}/share/doc/{{ name }}
- install -m 644 -D README.rst ${PREFIX}/share/doc/{{ name }}
- install -m 644 -D LICENSE ${PREFIX}/share/doc/{{ name }}
- - find doc -type f -exec install -m 644 -D "{}" "${PREFIX}/share/doc/{{ name }}/{}" \;
+ - cp -R doc "${PREFIX}/share/doc/{{ name }}/"
requirements:
host:
--
GitLab
From bf3441f1e28aa5ceeeddda2c334b47b87f2d2fde Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Tue, 19 Feb 2019 10:22:41 +0100
Subject: [PATCH 2/2] Shorten copy commands and use license file definition
---
conda/meta.yaml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 59dd165..778c374 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -14,12 +14,10 @@ build:
- python setup.py sdist --formats=zip
{% endif %}
- python setup.py install --single-version-externally-managed --record record.txt
- # installs the documentation source, readme and license to share/doc
- # so it is available during test time
- - install -d ${PREFIX}/share/doc/{{ name }}
- - install -m 644 -D README.rst ${PREFIX}/share/doc/{{ name }}
- - install -m 644 -D LICENSE ${PREFIX}/share/doc/{{ name }}
- - cp -R doc "${PREFIX}/share/doc/{{ name }}/"
+ # installs the documentation source, readme to share/doc so it is available
+ # during test time
+ - install -d "${PREFIX}/share/doc/{{ name }}"
+ - cp -R README.rst doc "${PREFIX}/share/doc/{{ name }}/"
requirements:
host:
@@ -54,6 +52,7 @@ test:
about:
home: https://www.idiap.ch/software/bob/
- license: BSD 3-Clause
summary: A collection of zc.buildout recipes for Bob packages
+ license: BSD 3-Clause
license_family: BSD
+ license_file: ../LICENSE
--
GitLab