diff --git a/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json b/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json index a3caefff32..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,7 @@ { - "maintainer_name": "Microsoft", - "maintainer_email": "dotnetcore@microsoft.com", + "maintainer_name": ".NET Core Team", + "maintainer_email": "dotnetpackages@dotnetfoundation.org", + "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 0a7ef7b282..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,7 @@ { - "maintainer_name":"Microsoft", - "maintainer_email": "dotnetcore@microsoft.com", + "maintainer_name": ".NET Core Team", + "maintainer_email": "dotnetpackages@dotnetfoundation.org", + "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 fc2ce89638..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,7 @@ { - "maintainer_name":"Microsoft", - "maintainer_email": "dotnetcore@microsoft.com", + "maintainer_name": ".NET Core Team", + "maintainer_email": "dotnetpackages@dotnetfoundation.org", + "vendor": ".NET Foundation", "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..d04cb8c216 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 + " <" + 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)))); 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; }