rpms/rpm/F-11 rpm-4.7.0-findlang-kde3.patch, NONE, 1.1 rpm.spec, 1.346, 1.347

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22094

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.0-findlang-kde3.patch 
Log Message:
- fix find-lang --with-kde with KDE3 (#466009)


rpm-4.7.0-findlang-kde3.patch:

--- NEW FILE rpm-4.7.0-findlang-kde3.patch ---
commit acfe923bf21a4402a48b6e357a53a398b107f0b3
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Apr 12 21:39:50 2009 +0300

    Fix --with-kde with KDE3 (rhbz#466009).

diff --git a/scripts/find-lang.sh b/scripts/find-lang.sh
index 2dd9e0d..bb25b31 100755
--- a/scripts/find-lang.sh
+++ b/scripts/find-lang.sh
@@ -138,7 +138,7 @@ if [ x"$KDE3_HTML" != x -a -d "$TOP_DIR$KDE3_HTML" ]; then
 find $TOP_DIR$KDE3_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:
+'"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3:
 '"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\)::
 '"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:
 s:^\([^%].*\)::


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-11/rpm.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -p -r1.346 -r1.347
--- rpm.spec	18 Jun 2009 15:45:51 -0000	1.346
+++ rpm.spec	18 Jun 2009 15:48:01 -0000	1.347
@@ -43,6 +43,7 @@ Patch2: rpm-4.5.90-gstreamer-provides.pa
 Patch3: rpm-4.6.0-fedora-specspo.patch
 
 # Patches already in upstream
+Patch200: rpm-4.7.0-findlang-kde3.patch
 
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
@@ -184,6 +185,8 @@ that will manipulate RPM packages and da
 %patch2 -p1 -b .gstreamer-prov
 %patch3 -p1 -b .fedora-specspo
 
+%patch200 -p1 -b .findlang-kde3
+
 %patch300 -p1 -b .extra-prov
 %patch301 -p1 -b .niagara
 
@@ -397,6 +400,7 @@ exit 0
 - file classification tweaks for text files (#494817)
   - disable libmagic text token checks, it's way too error-prone
   - consistently classify all text as such and include description
+- fix find-lang --with-kde with KDE3 (#466009)
 
 * Thu Apr 16 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-1
 - update to 4.7.0 final (http://rpm.org/wiki/Releases/4.7.0)