Update structured references to the license to the new license.

Since these are intended to be short and succinct, I've used the SPDX
full name. It's human readable, but formally agreed upon and will be
part of the SPDX spec for licenses.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351649 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/llvm.spec.in b/llvm.spec.in
index d4ef08a..d078645 100644 (file)
--- a/llvm.spec.in
+++ b/llvm.spec.in
@@ -2,7 +2,7 @@ Name: @PACKAGE_NAME@
 Version: @PACKAGE_VERSION@
 Release: 0
 Summary: LLVM (An Optimizing Compiler Infrastructure)
-License: University of Illinois/NCSA Open Source License
+License: Apache-2.0 with LLVM exception
 Vendor: None (open source)
 Group: Development/Compilers
 URL: http://llvm..org/

diff --git a/utils/lit/setup.py b/utils/lit/setup.py
index 10de6bb..b27ed26 100644 (file)
--- a/utils/lit/setup.py
+++ b/utils/lit/setup.py
@@ -16,7 +16,7 @@ setup(
     author = lit.__author__,
     author_email = lit.__email__,
     url = 'http://llvm.org',
-    license = 'BSD',
+    license = 'Apache-2.0 with LLVM exception',
 
     description = "A Software Testing Tool",
     keywords = 'test C++ automatic discovery',
@@ -60,7 +60,7 @@ http://llvm.org/svn/llvm-project/llvm/trunk/utils/lit.
         'Development Status :: 3 - Alpha',
         'Environment :: Console',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: University of Illinois/NCSA Open Source License',
+        'License :: OSI Approved :: Apache-2.0 with LLVM exception',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python',