rpms/qt/F-11 qt-x11-opensource-src-4.5.0-pa-in.patch, 1.1, 1.2 qt.spec, 1.264, 1.265

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.0-pa-in.patch 
Log Message:
* Thu May 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.1-3.1
- look for pa-in instead of pa in fontconfig (#497984)

qt-x11-opensource-src-4.5.0-pa-in.patch:

Index: qt-x11-opensource-src-4.5.0-pa-in.patch
===================================================================
RCS file: qt-x11-opensource-src-4.5.0-pa-in.patch
diff -N qt-x11-opensource-src-4.5.0-pa-in.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ qt-x11-opensource-src-4.5.0-pa-in.patch	7 May 2009 04:19:48 -0000	1.2
@@ -0,0 +1,21 @@
+diff -ur qt-x11-opensource-src-4.5.0/src/gui/text/qfontdatabase_x11.cpp qt-x11-opensource-src-4.5.0-pa-in/src/gui/text/qfontdatabase_x11.cpp
+--- qt-x11-opensource-src-4.5.0/src/gui/text/qfontdatabase_x11.cpp	2009-02-25 22:09:23.000000000 +0100
++++ qt-x11-opensource-src-4.5.0-pa-in/src/gui/text/qfontdatabase_x11.cpp	2009-05-07 03:21:08.000000000 +0200
+@@ -818,7 +818,7 @@
+     "div", // Thaana
+     "hi", // Devanagari
+     "bn", // Bengali
+-    "pa", // Gurmukhi
++    "pa-in", // Gurmukhi
+     "gu", // Gujarati
+     "or", // Oriya
+     "ta", // Tamil
+@@ -883,7 +883,7 @@
+     "div", // Thaana
+     "hi",  // Devanagari
+     "bn",  // Bengali
+-    "pa",  // Gurmukhi
++    "pa-in",  // Gurmukhi
+     "gu",  // Gujarati
+     "or",  // Oriya
+     "ta",  // Tamil


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-11/qt.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -p -r1.264 -r1.265
--- qt.spec	24 Apr 2009 17:17:51 -0000	1.264
+++ qt.spec	7 May 2009 04:19:48 -0000	1.265
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 3%{?dist}
+Release: 3%{?dist}.1
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -42,6 +42,8 @@ Patch13: qt-x11-opensource-src-4.5.0-gcc
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
 Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
 Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
+# look for pa-in instead of pa in fontconfig (#497984)
+Patch16: qt-x11-opensource-src-4.5.0-pa-in.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -320,6 +322,7 @@ test -x apply_patches && ./apply_patches
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
 %patch15 -p1 -b .enable_ft_lcdfilter
+%patch16 -p1 -b .pa-in
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -804,6 +807,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
+* Thu May 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.1-3.1
+- look for pa-in instead of pa in fontconfig (#497984)
+
 * Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
 - enable FT_LCD_FILTER