Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Rpm Packaging improvements for adding Vendor name and updating Packager value #2525

Merged
vivmishra merged 4 commits into from
May 25, 2017
Merged

Rpm Packaging improvements for adding Vendor name and updating Packager value #2525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af74ae8
Added Vendor flag and updated value for maintainer
vivmishra May 25, 2017
2d00189
Removed email from maintainer name and added the same to the paramete…
vivmishra May 25, 2017
618990c
Updated Vendor value
vivmishra May 25, 2017
865533f
Made email edits based on feedback
vivmishra May 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
5 changes: 3 additions & 2 deletions src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
5 changes: 3 additions & 2 deletions src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 3 additions & 1 deletion tools-local/tasks/BuildFPMToolPreReqs .cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))));
Expand Down Expand Up @@ -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; }
Expand Down