From ca4fc5d7176f679ae66e70e6d4b92fb1a04d18a3 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 17:29:06 +0100 Subject: [PATCH] find-lang.sh: patched to fix detection of qt translations [release 4.14.2.1-13mamba;Sat Aug 31 2019] --- rpm-4.14.2.1-find-lang-qt-fix.patch | 10 ++++++++++ rpm.spec | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 rpm-4.14.2.1-find-lang-qt-fix.patch diff --git a/rpm-4.14.2.1-find-lang-qt-fix.patch b/rpm-4.14.2.1-find-lang-qt-fix.patch new file mode 100644 index 0000000..e43fa94 --- /dev/null +++ b/rpm-4.14.2.1-find-lang-qt-fix.patch @@ -0,0 +1,10 @@ +--- rpm-4.14.2.1/scripts/find-lang.sh.orig 2019-08-31 12:50:47.237000000 +0200 ++++ rpm-4.14.2.1/scripts/find-lang.sh 2019-08-31 12:50:53.363000000 +0200 +@@ -235,6 +235,7 @@ + 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_@]*\)/LC_MESSAGES/.*\.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: diff --git a/rpm.spec b/rpm.spec index 29e1504..47ad29d 100644 --- a/rpm.spec +++ b/rpm.spec @@ -17,7 +17,7 @@ Name: rpm Epoch: 1 Version: 4.14.2.1 -Release: 12mamba +Release: 13mamba Summary: The RPM Package Manager (RPM) is a powerful package management system Group: System/Management Vendor: openmamba @@ -38,6 +38,7 @@ Patch8: rpm-4.14.2.1-arm-openamba-force-armv5t.patch Patch9: rpm-4.14.2.1-increase_default_patch_fuzz.patch Patch10: rpm-4.14.2.1-openmamba-buildroot.patch Patch11: rpm-4.14.2.1-target-platform-gnu.patch +Patch12: rpm-4.14.2.1-find-lang-qt-fix.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -131,6 +132,7 @@ This package should be installed if you want to develop Python programs that wil %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %build #:<< _EOF @@ -272,6 +274,9 @@ _EOF %{python27_sitearch}/rpm/* %changelog +* Sat Aug 31 2019 Silvan Calarco 4.14.2.1-13mamba +- find-lang.sh: patched to fix detection of qt translations + * Thu Aug 01 2019 Silvan Calarco 4.14.2.1-12mamba - added patch to add %{_gnu} to %_target platform