Rpm Packaging improvements for adding Vendor name and updating Packager value (dotnet...

* Added Vendor flag and updated value for maintainer

* Removed email from maintainer name and added the same to the parameter value separately

* Updated Vendor value

* Made email edits based on feedback

Commit migrated from https://github.com/dotnet/core-setup/commit/53771d8bfc8b19afbd45e5dbdcf727049d4f9231

diff --git a/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json
index a3caeff..319964e 100644 (file)
--- a/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json
+++ b/src/installer/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/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json
index 0a7ef7b..b9afffa 100644 (file)
--- a/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json
+++ b/src/installer/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/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json
index fc2ce89..ab098ca 100644 (file)
--- a/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json
+++ b/src/installer/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 031b4f4..d04cb8c 100644 (file)
--- a/tools-local/tasks/BuildFPMToolPreReqs .cs
+++ b/tools-local/tasks/BuildFPMToolPreReqs .cs
@@ -187,7 +187,8 @@ namespace Microsoft.DotNet.Build.Tasks
             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 @@ namespace Microsoft.DotNet.Build.Tasks
     {
         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; }