Browse Source

Merge pull request #2472 from nak3/spec-license

move LICENSE to /usr/share/licenses/openshift-ansible-VERSION/
Scott Dodson 8 years ago
parent
commit
bb8323195e
2 changed files with 4 additions and 13 deletions
  1. 2 12
      LICENSE.md
  2. 2 1
      openshift-ansible.spec

+ 2 - 12
LICENSE.md

@@ -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");

+ 2 - 1
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