From 26c910c59c47bdef4220c34e66c45a625bda5e56 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Tue, 12 Mar 2019 16:48:17 -0700
Subject: [PATCH] bpo-36174: Update nuget authoring for new license field.
 (GH-12300)

---
 Tools/nuget/python.nuspec              | 3 +--
 Tools/nuget/pythondaily.nuspec         | 5 ++---
 Tools/nuget/pythondaily.symbols.nuspec | 2 --
 Tools/nuget/pythonx86.nuspec           | 3 +--
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Tools/nuget/python.nuspec b/Tools/nuget/python.nuspec
index d5f3e632423..8f98e808916 100644
--- a/Tools/nuget/python.nuspec
+++ b/Tools/nuget/python.nuspec
@@ -5,9 +5,8 @@
     <title>Python</title>
     <version>0.0.0.0</version>
     <authors>Python Software Foundation</authors>
-    <licenseUrl>https://docs.python.org/3/license.html</licenseUrl>
+    <license type="file">tools\LICENSE.txt</license>
     <projectUrl>https://www.python.org/</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Installs 64-bit Python for use in build scenarios.</description>
     <iconUrl>https://www.python.org/static/favicon.ico</iconUrl>
     <tags>python</tags>
diff --git a/Tools/nuget/pythondaily.nuspec b/Tools/nuget/pythondaily.nuspec
index ee3343bbb7b..5cf55806ddf 100644
--- a/Tools/nuget/pythondaily.nuspec
+++ b/Tools/nuget/pythondaily.nuspec
@@ -3,11 +3,10 @@
   <metadata>
     <id>pythondaily</id>
     <title>Python (Daily build)</title>
-    <version>0.0.0.0</version>
     <authors>Python Software Foundation</authors>
-    <licenseUrl>https://docs.python.org/3/license.html</licenseUrl>
+    <version>0.0.0.0</version>
+    <license type="file">tools\LICENSE.txt</license>
     <projectUrl>https://www.python.org/</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Installs an unsigned, untested build of Python for test purposes only.</description>
     <iconUrl>https://www.python.org/static/favicon.ico</iconUrl>
     <tags>python</tags>
diff --git a/Tools/nuget/pythondaily.symbols.nuspec b/Tools/nuget/pythondaily.symbols.nuspec
index b89717a1afe..608e15c50e0 100644
--- a/Tools/nuget/pythondaily.symbols.nuspec
+++ b/Tools/nuget/pythondaily.symbols.nuspec
@@ -5,9 +5,7 @@
     <title>Python (Daily build)</title>
     <version>0.0.0.0</version>
     <authors>Python Software Foundation</authors>
-    <licenseUrl>https://docs.python.org/3/license.html</licenseUrl>
     <projectUrl>https://www.python.org/</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Contains symbols for the daily build of Python.</description>
     <iconUrl>https://www.python.org/static/favicon.ico</iconUrl>
     <tags>python</tags>
diff --git a/Tools/nuget/pythonx86.nuspec b/Tools/nuget/pythonx86.nuspec
index ebfcd6c92a4..27ef67e7f5d 100644
--- a/Tools/nuget/pythonx86.nuspec
+++ b/Tools/nuget/pythonx86.nuspec
@@ -5,9 +5,8 @@
     <title>Python (32-bit)</title>
     <authors>Python Software Foundation</authors>
     <version>0.0.0.0</version>
-    <licenseUrl>https://docs.python.org/3/license.html</licenseUrl>
+    <license type="file">tools\LICENSE.txt</license>
     <projectUrl>https://www.python.org/</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Installs 32-bit Python for use in build scenarios.</description>
     <iconUrl>https://www.python.org/static/favicon.ico</iconUrl>
     <tags>python</tags>