From 040ce1a127f200ae87bc93c27bcb35eddd21507d Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Dec 05 2022 13:40:40 +0000
Subject: Support long language names for QT


Resolves: #2144005

---

diff --git a/rpm-4.16.1.3-Support-long-languages-names-for-QT.patch b/rpm-4.16.1.3-Support-long-languages-names-for-QT.patch
new file mode 100644
index 0000000..a2d3419
--- /dev/null
+++ b/rpm-4.16.1.3-Support-long-languages-names-for-QT.patch
@@ -0,0 +1,40 @@
+From 35739c2a2298e61caacb45157706bf342ffcd20e Mon Sep 17 00:00:00 2001
+From: Florian Festi <ffesti@redhat.com>
+Date: Tue, 27 Apr 2021 10:09:41 +0200
+Subject: [PATCH] find-lang.sh: Support long languages names for QT
+
+Most language abbreviations are just two characters but some are longer.
+Allow an arbiraty number of character instead of exactly two in the names
+of .qm files (QT translations). This brings the handling of .qm files in
+line with all other file types.
+
+Resolves: #1642
+---
+ scripts/find-lang.sh | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/scripts/find-lang.sh b/scripts/find-lang.sh
+index f2aa7d8951..b97210b117 100755
+--- a/scripts/find-lang.sh
++++ b/scripts/find-lang.sh
+@@ -249,13 +249,13 @@ s:%lang(C) ::
+ 
+ find "$TOP_DIR" -type f -o -type l|sed '
+ s:'"$TOP_DIR"'::
+-'"$NO_ALL_NAME$QT"'s:\(.*/'"$NAME"'_\([a-zA-Z]\{2\}\([_@].*\)\?\)\.qm$\):%lang(\2) \1:
+-'"$ALL_NAME$QT"'s:^\([^%].*/\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
+-'"$ALL_NAME$QT"'s:^\([^%].*/\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
+-'"$ALL_NAME$QT"'s:^\([^%].*/[^/_]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
+-'"$ALL_NAME$QT"'s:^\([^%].*/[^/_]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
+-'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
+-'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
++'"$NO_ALL_NAME$QT"'s:\(.*/'"$NAME"'_\([a-zA-Z]\+\([_@].*\)\?\)\.qm$\):%lang(\2) \1:
++'"$ALL_NAME$QT"'s:^\([^%].*/\([a-zA-Z]\+[_@].*\)\.qm$\):%lang(\2) \1:
++'"$ALL_NAME$QT"'s:^\([^%].*/\([a-zA-Z]\+\)\.qm$\):%lang(\2) \1:
++'"$ALL_NAME$QT"'s:^\([^%].*/[^/_]\+_\([a-zA-Z]\+[_@].*\)\.qm$\):%lang(\2) \1:
++'"$ALL_NAME$QT"'s:^\([^%].*/[^/_]\+_\([a-zA-Z]\+\)\.qm$\):%lang(\2) \1:
++'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\+[_@].*\)\.qm$\):%lang(\2) \1:
++'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\+\)\.qm$\):%lang(\2) \1:
+ s:^[^%].*::
+ s:%lang(C) ::
+ /^$/d' >> $MO_NAME
diff --git a/rpm.spec b/rpm.spec
index c2b481f..9bdb4ce 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -32,7 +32,7 @@
 
 %global rpmver 4.16.1.3
 #global snapver rc1
-%global rel 20
+%global rel 21
 %global sover 9
 
 %global srcver %{rpmver}%{?snapver:-%{snapver}}
@@ -90,6 +90,7 @@ Patch118: rpm-4.16.1.3-caret-query2.patch
 Patch119: rpm-4.18-libselinux-log.patch
 Patch120: rpm-4.16.1.3-rpm2archive-error-handling.patch
 Patch121: rpm-4.16.1.3-rpm2archive-nocompression.patch
+Patch122: rpm-4.16.1.3-Support-long-languages-names-for-QT.patch
 
 # These are not yet upstream
 Patch906: rpm-4.7.1-geode-i686.patch
@@ -623,6 +624,9 @@ fi
 %doc doc/librpm/html/*
 
 %changelog
+* Fri Nov 18 2022 Yaakov Selkowitz <yselkowi@redhat.com> - 4.16.1.3-21
+- Support long language names for QT (#2144005)
+
 * Mon Nov 07 2022 Florian Festi <ffesti@redhat.com> - 4.16.1.3-20
 - Add bcond macros (#2129060)
 - Fix db queries with carets (#2129468)