From 51c07b9cf25d5617a1f80421aeed930c689cf088 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Thu, 17 Dec 2020 11:51:29 +0100
Subject: [PATCH] makedist-announcement.sh: some announcements content updates

---
 makedist/makedist-announcement.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/makedist/makedist-announcement.sh b/makedist/makedist-announcement.sh
index e72703a..96e4d25 100755
--- a/makedist/makedist-announcement.sh
+++ b/makedist/makedist-announcement.sh
@@ -423,16 +423,16 @@ $distribution-$mediumname-$l-$mediadistversion-$version.${a}.${medium_suffix}</a
 
    block_start
    print_pkg_line "RPM" rpm
-   print_pkg_line "Smart Package Manager" smart
+   print_pkg_line "DNF Package Manager" dnf
    print_pkg_line "PackageKit" PackageKit
-   print_pkg_line "KDE PackageKit GUI" kpackagekit
+   print_pkg_line "KDE Discover" discover
    print_pkg_line "Gnome PackageKit GUI" gnome-packagekit
    block_end $"Packages and updates management"
 
    block_start
    print_pkg_line X.org xorg-server
    print_pkg_line Mesa Mesa
-   print_pkg_line KDE kde-workspace
+   print_pkg_line KDE plasma-workspace
    print_pkg_line GNOME gnome-desktop
    print_pkg_line LXDE lxde-common
    block_end $"Graphical and Desktop environment"
@@ -490,9 +490,8 @@ _EOF
    echo "<li><a href='http://$siteaddress/distribution/$sitedistversion.html?lang=$outputlang'>"$"$sitedistversion channels and packages""</a>" >> $outputfile
 _EOF
    echo "\
-<li><a href='http://$siteaddress/$outputlang/forum/'>"$"$distribution forum""</a>\
-<li><a href='http://$siteaddress/$outputlang/bugs/'>"$"$distribution bug tracking system""</a>\
-<li><a href='http://$siteaddress/$outputlang/wiki/'>"$"$distribution wiki""</a></ul>\
+<li><a href='https://$siteaddress/$outputlang/'>"$"$distribution website""</a>\
+<li><a href='https://$siteaddress/$outputlang/forum/'>"$"$distribution forum""</a>\
 " >> $outputfile
 
    echo -n "</div><hr><p><i>"$"Announcement automatically generated by"" makedist $makedist_version " >> $outputfile