Fixes to comply with RPM packaging guidelines (dotnet/core-setup#2504)

Merged

Commit migrated from https://github.com/dotnet/core-setup/commit/627fcd3cad10f6024425d719dcef3e72fe72c75d

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 deca058..a3caeff 100644 (file)
--- a/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json
+++ b/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json
@@ -7,8 +7,7 @@
   "install_doc": "/usr/share/doc/%HOSTFXR_RPM_PACKAGE_NAME%/",
   
   "short_description": "%HOSTFXR_BRAND_NAME% %HOSTFXR_NUGET_VERSION%",
-  "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
-  
+  "long_description": ".NET Core is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.",
   "homepage": "https://github.com/dotnet/core",
   
   "release":{

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 636c4a3..0a7ef7b 100644 (file)
--- a/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json
+++ b/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json
@@ -6,8 +6,8 @@
     "install_root": "/usr/share/dotnet",
     "install_doc": "/usr/share/doc/%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%/",
 
-    "short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%",
-    "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
+    "short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME%",
+    "long_description": ".NET Core is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.",
     "homepage": "https://github.com/dotnet/core",
 
     "release":{

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 7a9ebfc..fc2ce89 100644 (file)
--- a/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json
+++ b/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json
@@ -8,7 +8,7 @@
     "install_man": "/usr/share/man/man1",
 
     "short_description": "%SHARED_HOST_BRAND_NAME%",
-    "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.",
+    "long_description": ".NET Core is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.",
     "homepage": "https://github.com/dotnet/core",
 
     "release":{

diff --git a/src/installer/pkg/packaging/rpm/templates/changelog b/src/installer/pkg/packaging/rpm/templates/changelog
index 1d7382d..e61dbc6 100644 (file)
--- a/src/installer/pkg/packaging/rpm/templates/changelog
+++ b/src/installer/pkg/packaging/rpm/templates/changelog
@@ -1,2 +1,2 @@
-* {DATE} {MAINTAINER_NAME} <{MAINTAINER_EMAIL}> {PACKAGE_NAME} ({PACKAGE_VERSION}-{PACKAGE_REVISION}) unstable; urgency={URGENCY}
+* {DATE} {MAINTAINER_NAME} <{MAINTAINER_EMAIL}> - {PACKAGE_VERSION}-{PACKAGE_REVISION}
 - {CHANGELOG_MESSAGE}