Djam/rpm
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rpm.git synced 2025-02-23 18:33:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Patch find_lang to support KDE5

Browse source
This commit is contained in:
Denis Silakov 2015-03-12 11:00:23 +04:00
parent e0a2fe981d
commit de344f782a
2 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
rpm-5.4.10-find-lang-kde5.patch Normal file
View file

@ -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:

6
rpm.spec
View file

@ -61,7 +61,7 @@ Summary: The RPM package management system
Name: rpm Name: rpm
Epoch: 1 Epoch: 1
Version: %{libver}.%{minorver} Version: %{libver}.%{minorver}
Release: %{?prereldate:0.%{prereldate}.}55 Release: %{?prereldate:0.%{prereldate}.}56
License: LGPLv2.1+ License: LGPLv2.1+
Group: System/Configuration/Packaging Group: System/Configuration/Packaging
Url: http://rpm5.org/ 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 # don't use hashes for inodes to avoid hash collisions on large packages
Patch513: rpm-5.4.10-payload-no-hashed-inode.patch 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: autoconf >= 2.57
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
BuildRequires: automake >= 1.8 BuildRequires: automake >= 1.8
@ -900,6 +903,7 @@ This package contains the RPM API documentation generated in HTML format.
%patch511 -p1 -b .distepoch %patch511 -p1 -b .distepoch
%patch512 -p1 -b .hardlink-segfault-fix %patch512 -p1 -b .hardlink-segfault-fix
%patch513 -p1 -b .payload-no-hashed-inode %patch513 -p1 -b .payload-no-hashed-inode
%patch514 -p1 -b .kde5-find-lang
#required by P55, P80, P81, P94.. #required by P55, P80, P81, P94..
./autogen.sh ./autogen.sh