Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2017-05-17 10:45:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm"
Wed May 17 10:45:20 2017 rev:245 rq:492375 version:4.13.0.1
Changes:
--------
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-04-03 11:03:56.105624915
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-05-17
10:45:24.578323761 +0200
@@ -1,0 +2,6 @@
+Mon Apr 10 14:25:07 UTC 2017 - fv...@suse.com
+
+- Add patch to handle special case of .qm file paths correctly (boo#1027925):
+ * find-lang-qt-qm.patch
+
+-------------------------------------------------------------------
New:
----
find-lang-qt-qm.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
rpm-python.spec: same change
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.R49Bxq/_old 2017-05-17 10:45:27.009981698 +0200
+++ /var/tmp/diff_new_pack.R49Bxq/_new 2017-05-17 10:45:27.013981134 +0200
@@ -144,6 +144,7 @@
Patch100: rpm-findlang-inject-metainfo.patch
Patch101: nobfd.diff
Patch102: emptymanifest.diff
+Patch103: find-lang-qt-qm.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -239,7 +240,7 @@
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
%patch -P 80 -P 81 -P 82 -P 83 -P 85
%patch -P 92 -P 93 -P 94 -P 96 -P 98 -P 99
-%patch -P 100 -P 101 -P 102
+%patch -P 100 -P 101 -P 102 -P 103
%ifarch aarch64 ppc64le
%patch6464
++++++ find-lang-qt-qm.patch ++++++
Author: Fabian Vogt <fv...@suse.com>
Subject: Handle special cases of qt translations correctly
References: boo#1027925
Some KDE frameworks write their translations to files like this:
/usr/share/locale/ca/LC_MESSAGES/libkirigami2plugin_qt.qm
Without this patch it gets detected as %lang(qt), which is obviously
incorrect. This copies two lines from the .mo handling and adjusts
them to handle _qt.qm files as well. "qt" is not an official ISO language
code, so this should not break anything in the past or hopefully the future.
Signed-off-by: Fabian Vogt <fv...@suse.com>
---
scripts/find-lang.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- scripts/find-lang.sh.orig
+++ scripts/find-lang.sh
@@ -303,9 +303,11 @@ 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:\(.*/locale/\)\([^/]\+\)\(/.\+/\)\([^/]\+_qt\.qm$\):%lang(\2)
\1\2\3\4:
+'"$NO_ALL_NAME$QT"'s:\(.*/locale/\)\([^/]\+\)\(/.\+/\)\('"$NAME"'_qt\.qm$\):%lang(\2)
\1\2\3\4:
+'"$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:
s:^[^%].*::
