rpms/qt/F-11 qt.spec, 1.261.2.2, 1.261.2.3 qt-x11-opensource-src-4.5.0-pa-in.patch, 1.1.2.1, NONE

[Kevin Kofler]

Author: kkofler

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

Modified Files:
      Tag: qt-4_5_0-f11branch
	qt.spec 
Removed Files:
      Tag: qt-4_5_0-f11branch
	qt-x11-opensource-src-4.5.0-pa-in.patch 
Log Message:
Also kick out the pa-in patch on this CVS branch (qt-4_5_0-f11branch in F-11), just in case someone wants to use it.


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-11/qt.spec,v
retrieving revision 1.261.2.2
retrieving revision 1.261.2.3
diff -u -p -r1.261.2.2 -r1.261.2.3
--- qt.spec	7 May 2009 01:33:42 -0000	1.261.2.2
+++ qt.spec	9 May 2009 14:18:52 -0000	1.261.2.3
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 15%{?dist}
+Release: 14%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -46,8 +46,6 @@ Patch13: qt-x11-opensource-src-4.5.0-gcc
 Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.patch
 # http://bugzilla.redhat.com/490377
 Patch15: qt-x11-opensource-src-4.5.0-disable_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
@@ -330,7 +328,6 @@ test -x apply_patches && ./apply_patches
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
 %patch15 -p1 -b .disable_ft_lcdfilter
-%patch16 -p1 -b .pa-in
 %patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
@@ -815,9 +812,6 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
-* Thu May 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.0-15
-- look for pa-in instead of pa in fontconfig (#497984)
-
 * Tue Apr 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-14
 - fix vrgb/vgbr corruption, disable QT_USE_FREETYPE_LCDFILTER (#490377)
 


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