From 74e3fd651484a06035804b0df650bec77d5ecbb0 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Wed, 23 Mar 2022 08:34:08 +0100
Subject: [PATCH] 4.2.1

---
 CMakeLists.txt                                    | 4 ++--
 resources/desktop/com.github.rssguard.appdata.xml | 2 +-
 resources/text/CHANGELOG                          | 9 +++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e27f8fcb..f50c7385c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@
 # Other information:
 #   - supports Windows, Linux, *BSD, macOS, OS/2, Android,
 #   - Qt 5.10.0 or newer is required,
-#   - Qt 6.3.0 or newer is required,
+#   - Qt 6.2.3 or newer is required,
 #   - cmake 3.9.0 or newer is required,
 #   - if you wish to make packages for Windows, then you must initialize all submodules
 #     within repository before compilation,
@@ -60,7 +60,7 @@ set(APP_AUTHOR "Martin Rotter")
 set(APP_COPYRIGHT "\\251 2011-2022 ${APP_AUTHOR}")
 set(APP_REVERSE_NAME "com.github.rssguard")
 set(APP_DONATE_URL "https://github.com/sponsors/martinrotter")
-set(APP_VERSION "4.2.0")
+set(APP_VERSION "4.2.1")
 
 set(APP_URL "https://github.com/martinrotter/rssguard")
 set(APP_URL_DOCUMENTATION "https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md")
diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index 20f419716..a131aa876 100644
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -26,7 +26,7 @@
   <url type="donation">https://github.com/sponsors/martinrotter</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="4.2.0" date="2022-03-23"/>
+    <release version="4.2.1" date="2022-03-23"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 794d44595..af2a5c47b 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -1,3 +1,12 @@
+4.2.1
+-----
+
+Added:
+* Number format of unread counts in task bar icon and tray icon is now enhanced. It shows format "%1k" for number bigger than 999, for example 16 000 of unread articles will be displayed as "16k". (#662)
+
+Fixed:
+* Dynamic libraries are now properly "linked" in Mac OS X build. (#663)
+
 4.2.0
 -----