From af74ae8daecc964c29381bbad6c5475f4dd1781f Mon Sep 17 00:00:00 2001 From: vivmishra Date: Wed, 24 May 2017 22:39:28 -0700 Subject: [PATCH 1/4] Added Vendor flag and updated value for maintainer --- src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json | 3 ++- src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json | 3 ++- src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json | 3 ++- tools-local/tasks/BuildFPMToolPreReqs .cs | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json b/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json index a3caefff32..349938849f 100644 --- a/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json @@ -1,6 +1,7 @@ { - "maintainer_name": "Microsoft", + "maintainer_name": ".NET Core Team (dotnetcore@microsoft.com)", "maintainer_email": "dotnetcore@microsoft.com", + "vendor": "Microsoft Corporation", "package_name": "%HOSTFXR_RPM_PACKAGE_NAME%", "install_root": "/usr/share/dotnet", diff --git a/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json b/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json index 0a7ef7b282..ba84f5f064 100644 --- a/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json @@ -1,6 +1,7 @@ { - "maintainer_name":"Microsoft", + "maintainer_name": ".NET Core Team (dotnetcore@microsoft.com)", "maintainer_email": "dotnetcore@microsoft.com", + "vendor": "Microsoft Corporation", "package_name": "%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%", "install_root": "/usr/share/dotnet", diff --git a/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json b/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json index fc2ce89638..c59f88f104 100644 --- a/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json @@ -1,6 +1,7 @@ { - "maintainer_name":"Microsoft", + "maintainer_name": ".NET Core Team (dotnetcore@microsoft.com)", "maintainer_email": "dotnetcore@microsoft.com", + "vendor": "Microsoft Corporation", "package_name": "dotnet-host", "install_root": "/usr/share/dotnet", diff --git a/tools-local/tasks/BuildFPMToolPreReqs .cs b/tools-local/tasks/BuildFPMToolPreReqs .cs index 031b4f44a9..58700fd07d 100644 --- a/tools-local/tasks/BuildFPMToolPreReqs .cs +++ b/tools-local/tasks/BuildFPMToolPreReqs .cs @@ -187,7 +187,8 @@ private string BuildCmdParameters(ConfigJson configJson, string package_version) parameters.Add(string.Concat("--rpm-changelog ", EscapeArg(Path.Combine(InputDir, "templates", "changelog")))); // Changelog File parameters.Add(string.Concat("--rpm-summary ", EscapeArg(configJson.Short_Description))); parameters.Add(string.Concat("--description ", EscapeArg(configJson.Long_Description))); - parameters.Add(string.Concat("--maintainer ", configJson.Maintainer_Name)); + parameters.Add(string.Concat("--maintainer ", EscapeArg(configJson.Maintainer_Name))); + parameters.Add(string.Concat("--vendor ", EscapeArg(configJson.Vendor))); parameters.Add(string.Concat("-p ", Path.Combine(OutputDir, configJson.Package_Name + ".rpm"))); if (configJson.Package_Conflicts != null) parameters.Add(string.Concat("--conflicts ", EscapeArg(string.Join(",", configJson.Package_Conflicts)))); if (configJson.After_Install_Source != null) parameters.Add(string.Concat("--after-install ", Path.Combine(InputDir, EscapeArg(configJson.After_Install_Source)))); @@ -275,6 +276,7 @@ public class ConfigJson { public string Maintainer_Name { get; set; } public string Maintainer_Email { get; set; } + public string Vendor { get; set; } public string Package_Name { get; set; } public string Install_Root { get; set; } public string Install_Doc { get; set; } From 2d0018951c095c043f40b7d549f4161389a50ebb Mon Sep 17 00:00:00 2001 From: vivmishra Date: Thu, 25 May 2017 10:52:03 -0700 Subject: [PATCH 2/4] Removed email from maintainer name and added the same to the parameter value separately --- src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json | 2 +- src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json | 2 +- src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json | 2 +- tools-local/tasks/BuildFPMToolPreReqs .cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json b/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json index 349938849f..7f0f85e89e 100644 --- a/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json @@ -1,5 +1,5 @@ { - "maintainer_name": ".NET Core Team (dotnetcore@microsoft.com)", + "maintainer_name": ".NET Core Team", "maintainer_email": "dotnetcore@microsoft.com", "vendor": "Microsoft Corporation", diff --git a/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json b/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json index ba84f5f064..5ecc3aa8b2 100644 --- a/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json @@ -1,5 +1,5 @@ { - "maintainer_name": ".NET Core Team (dotnetcore@microsoft.com)", + "maintainer_name": ".NET Core Team", "maintainer_email": "dotnetcore@microsoft.com", "vendor": "Microsoft Corporation", diff --git a/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json b/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json index c59f88f104..5fea6a4343 100644 --- a/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json @@ -1,5 +1,5 @@ { - "maintainer_name": ".NET Core Team (dotnetcore@microsoft.com)", + "maintainer_name": ".NET Core Team", "maintainer_email": "dotnetcore@microsoft.com", "vendor": "Microsoft Corporation", diff --git a/tools-local/tasks/BuildFPMToolPreReqs .cs b/tools-local/tasks/BuildFPMToolPreReqs .cs index 58700fd07d..06ce95645f 100644 --- a/tools-local/tasks/BuildFPMToolPreReqs .cs +++ b/tools-local/tasks/BuildFPMToolPreReqs .cs @@ -187,7 +187,7 @@ private string BuildCmdParameters(ConfigJson configJson, string package_version) parameters.Add(string.Concat("--rpm-changelog ", EscapeArg(Path.Combine(InputDir, "templates", "changelog")))); // Changelog File parameters.Add(string.Concat("--rpm-summary ", EscapeArg(configJson.Short_Description))); parameters.Add(string.Concat("--description ", EscapeArg(configJson.Long_Description))); - parameters.Add(string.Concat("--maintainer ", EscapeArg(configJson.Maintainer_Name))); + parameters.Add(string.Concat("--maintainer ", EscapeArg(configJson.Maintainer_Name + " (" + configJson.Maintainer_Email + ")"))); parameters.Add(string.Concat("--vendor ", EscapeArg(configJson.Vendor))); parameters.Add(string.Concat("-p ", Path.Combine(OutputDir, configJson.Package_Name + ".rpm"))); if (configJson.Package_Conflicts != null) parameters.Add(string.Concat("--conflicts ", EscapeArg(string.Join(",", configJson.Package_Conflicts)))); From 618990c4a5359c239255e8d398265a6b320899dc Mon Sep 17 00:00:00 2001 From: vivmishra Date: Thu, 25 May 2017 12:28:03 -0700 Subject: [PATCH 3/4] Updated Vendor value --- src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json | 2 +- src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json | 2 +- src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json b/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json index 7f0f85e89e..6adcc97163 100644 --- a/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json @@ -1,7 +1,7 @@ { "maintainer_name": ".NET Core Team", "maintainer_email": "dotnetcore@microsoft.com", - "vendor": "Microsoft Corporation", + "vendor": ".NET Foundation", "package_name": "%HOSTFXR_RPM_PACKAGE_NAME%", "install_root": "/usr/share/dotnet", diff --git a/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json b/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json index 5ecc3aa8b2..2589b79cc7 100644 --- a/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json @@ -1,7 +1,7 @@ { "maintainer_name": ".NET Core Team", "maintainer_email": "dotnetcore@microsoft.com", - "vendor": "Microsoft Corporation", + "vendor": ".NET Foundation", "package_name": "%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%", "install_root": "/usr/share/dotnet", diff --git a/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json b/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json index 5fea6a4343..1019667d07 100644 --- a/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json @@ -1,7 +1,7 @@ { "maintainer_name": ".NET Core Team", "maintainer_email": "dotnetcore@microsoft.com", - "vendor": "Microsoft Corporation", + "vendor": ".NET Foundation", "package_name": "dotnet-host", "install_root": "/usr/share/dotnet", From 865533fddf2fa15c9d114fc86166b46fdb7ec095 Mon Sep 17 00:00:00 2001 From: vivmishra Date: Thu, 25 May 2017 14:48:07 -0700 Subject: [PATCH 4/4] Made email edits based on feedback --- src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json | 2 +- src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json | 2 +- src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json | 2 +- tools-local/tasks/BuildFPMToolPreReqs .cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json b/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json index 6adcc97163..319964ea1e 100644 --- a/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json @@ -1,6 +1,6 @@ { "maintainer_name": ".NET Core Team", - "maintainer_email": "dotnetcore@microsoft.com", + "maintainer_email": "dotnetpackages@dotnetfoundation.org", "vendor": ".NET Foundation", "package_name": "%HOSTFXR_RPM_PACKAGE_NAME%", diff --git a/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json b/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json index 2589b79cc7..b9afffa280 100644 --- a/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json @@ -1,6 +1,6 @@ { "maintainer_name": ".NET Core Team", - "maintainer_email": "dotnetcore@microsoft.com", + "maintainer_email": "dotnetpackages@dotnetfoundation.org", "vendor": ".NET Foundation", "package_name": "%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%", diff --git a/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json b/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json index 1019667d07..ab098caeeb 100644 --- a/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json @@ -1,6 +1,6 @@ { "maintainer_name": ".NET Core Team", - "maintainer_email": "dotnetcore@microsoft.com", + "maintainer_email": "dotnetpackages@dotnetfoundation.org", "vendor": ".NET Foundation", "package_name": "dotnet-host", diff --git a/tools-local/tasks/BuildFPMToolPreReqs .cs b/tools-local/tasks/BuildFPMToolPreReqs .cs index 06ce95645f..d04cb8c216 100644 --- a/tools-local/tasks/BuildFPMToolPreReqs .cs +++ b/tools-local/tasks/BuildFPMToolPreReqs .cs @@ -187,7 +187,7 @@ private string BuildCmdParameters(ConfigJson configJson, string package_version) parameters.Add(string.Concat("--rpm-changelog ", EscapeArg(Path.Combine(InputDir, "templates", "changelog")))); // Changelog File parameters.Add(string.Concat("--rpm-summary ", EscapeArg(configJson.Short_Description))); parameters.Add(string.Concat("--description ", EscapeArg(configJson.Long_Description))); - parameters.Add(string.Concat("--maintainer ", EscapeArg(configJson.Maintainer_Name + " (" + configJson.Maintainer_Email + ")"))); + parameters.Add(string.Concat("--maintainer ", EscapeArg(configJson.Maintainer_Name + " <" + configJson.Maintainer_Email + ">"))); parameters.Add(string.Concat("--vendor ", EscapeArg(configJson.Vendor))); parameters.Add(string.Concat("-p ", Path.Combine(OutputDir, configJson.Package_Name + ".rpm"))); if (configJson.Package_Conflicts != null) parameters.Add(string.Concat("--conflicts ", EscapeArg(string.Join(",", configJson.Package_Conflicts))));