diff --git a/rpm-5.4.10-find-lang-kde5.patch b/rpm-5.4.10-find-lang-kde5.patch new file mode 100644 index 0000000..c19c021 --- /dev/null +++ b/rpm-5.4.10-find-lang-kde5.patch @@ -0,0 +1,29 @@ +diff -urN rpm-5.4.10/scripts/find-lang.sh rpm-5.4.10-patched/scripts/find-lang.sh +--- rpm-5.4.10/scripts/find-lang.sh 2012-06-02 00:29:07.000000000 +1100 ++++ rpm-5.4.10-patched/scripts/find-lang.sh 2015-03-12 14:56:08.000000000 +1000 +@@ -192,9 +192,9 @@ + s:%lang(C) :: + /^$/d' >> $MO_NAME + +-KDE3_HTML=`kde-config --expandvars --install html 2>/dev/null` +-if [ x"$KDE3_HTML" != x -a -d "$TOP_DIR$KDE3_HTML" ]; then +-find "$TOP_DIR$KDE3_HTML" -type d|sed ' ++KDE4_HTML=`kde4-config --expandvars --install html 2>/dev/null` ++if [ x"$KDE4_HTML" != x -a -d "$TOP_DIR$KDE4_HTML" ]; then ++find "$TOP_DIR$KDE4_HTML" -type d|sed ' + s:'"$TOP_DIR"':: + '"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\):: + '"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3: +@@ -205,9 +205,9 @@ + /^$/d' >> $MO_NAME + fi + +-KDE4_HTML=`kde4-config --expandvars --install html 2>/dev/null` +-if [ x"$KDE4_HTML" != x -a -d "$TOP_DIR$KDE4_HTML" ]; then +-find "$TOP_DIR$KDE4_HTML" -type d|sed ' ++KDE5_HTML="/usr/share/doc5/HTML/" ++if [ -d "$TOP_DIR$KDE5_HTML" ]; then ++find "$TOP_DIR$KDE5_HTML" -type d|sed ' + s:'"$TOP_DIR"':: + '"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\):: + '"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3: diff --git a/rpm.spec b/rpm.spec index 3f2c76b..f566aa0 100644 --- a/rpm.spec +++ b/rpm.spec @@ -61,7 +61,7 @@ Summary: The RPM package management system Name: rpm Epoch: 1 Version: %{libver}.%{minorver} -Release: %{?prereldate:0.%{prereldate}.}55 +Release: %{?prereldate:0.%{prereldate}.}56 License: LGPLv2.1+ Group: System/Configuration/Packaging Url: http://rpm5.org/ @@ -489,6 +489,9 @@ Patch512: rpm-5.4.10-hardlink-segfault-fix.patch # don't use hashes for inodes to avoid hash collisions on large packages Patch513: rpm-5.4.10-payload-no-hashed-inode.patch +# KDE5 support in find_lang +Patch514: rpm-5.4.10-find-lang-kde5.patch + BuildRequires: autoconf >= 2.57 BuildRequires: bzip2-devel BuildRequires: automake >= 1.8 @@ -900,6 +903,7 @@ This package contains the RPM API documentation generated in HTML format. %patch511 -p1 -b .distepoch %patch512 -p1 -b .hardlink-segfault-fix %patch513 -p1 -b .payload-no-hashed-inode +%patch514 -p1 -b .kde5-find-lang #required by P55, P80, P81, P94.. ./autogen.sh