diff options
author | Scott Dodson <sdodson@redhat.com> | 2016-09-20 10:14:53 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-20 10:14:53 -0400 |
commit | bb8323195ee2607bf4766befefffa1d02e6441fa (patch) | |
tree | c849def905267606d77991d261a15425a16070ec | |
parent | 47a2e769d1cd462d213f1367122e6af8c862650e (diff) | |
parent | 1c93a576cd133382f8c5f6757a3074659b0bcc5e (diff) | |
download | openshift-bb8323195ee2607bf4766befefffa1d02e6441fa.tar.gz openshift-bb8323195ee2607bf4766befefffa1d02e6441fa.tar.bz2 openshift-bb8323195ee2607bf4766befefffa1d02e6441fa.tar.xz openshift-bb8323195ee2607bf4766befefffa1d02e6441fa.zip |
Merge pull request #2472 from nak3/spec-license
move LICENSE to /usr/share/licenses/openshift-ansible-VERSION/
-rw-r--r-- | LICENSE (renamed from LICENSE.md) | 14 | ||||
-rw-r--r-- | openshift-ansible.spec | 3 |
2 files changed, 4 insertions, 13 deletions
@@ -1,4 +1,5 @@ -Apache License + + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -175,17 +176,6 @@ Apache License END OF TERMS AND CONDITIONS - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - Copyright 2014 Red Hat, Inc. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 5042743f8..dd16f7dc0 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -91,7 +91,8 @@ popd # Base openshift-ansible files %files -%doc LICENSE.md README* +%doc README* +%license LICENSE %dir %{_datadir}/ansible/%{name} %{_datadir}/ansible/%{name}/library %ghost %{_datadir}/ansible/%{name}/playbooks/common/openshift-master/library.rpmmoved |