rpms/qt/F-9 .cvsignore, 1.36, 1.37 qt.spec, 1.190, 1.191 sources, 1.39, 1.40 qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore qt.spec sources 
Removed Files:
	qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch 
Log Message:
* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-10
- drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch (#447298),
  in favor of qt-copy's 0263-fix-fontconfig-handling.diff

* Mon Jan 12 2009 Than Ngo <than at redhat.com> - 4.4.3-9
- qt-copy-patches-20090112



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	31 Dec 2008 19:16:54 -0000	1.36
+++ .cvsignore	13 Jan 2009 20:10:20 -0000	1.37
@@ -2,3 +2,4 @@
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.3.tar.bz2
 qt-copy-patches-20081225svn.tar.bz2
+qt-copy-patches-20090112svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- qt.spec	31 Dec 2008 19:16:54 -0000	1.190
+++ qt.spec	13 Jan 2009 20:10:20 -0000	1.191
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.3
-Release: 8%{?dist}
+Release: 10%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -33,15 +33,13 @@
 Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
 Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
 Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
-# kill hardcoded font substitutions (#447298)
-Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch
 # under GNOME, default to QGtkStyle if available
 # (otherwise fall back to QCleanlooksStyle)
 Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
 Patch10: qt-x11-opensource-src-4.4.3-im.patch
 
 ## qt-copy patches
-%define qt_copy 20081225 
+%define qt_copy 20090112
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -284,7 +282,6 @@
 %patch3 -p1 -b .multilib-QMAKEPATH
 %endif
 %patch5 -p1 -b .bz#437440-as_IN-437440
-%patch8 -p1 -b .font-aliases
 %patch9 -p1 -b .qgtkstyle
 %patch10 -p1 -b .im
 
@@ -734,6 +731,13 @@
 
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-10
+- drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch (#447298),
+  in favor of qt-copy's 0263-fix-fontconfig-handling.diff
+
+* Mon Jan 12 2009 Than Ngo <than at redhat.com> - 4.4.3-9
+- qt-copy-patches-20090112
+
 * Tue Dec 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-8
 - qt-copy-patches-20081225
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	31 Dec 2008 19:16:54 -0000	1.39
+++ sources	13 Jan 2009 20:10:20 -0000	1.40
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 00e00c6324d342a7b0d8653112b4f08c  qt-x11-opensource-src-4.4.3.tar.bz2
-00cd44f34d1e4840805ae71a20b378a4  qt-copy-patches-20081225svn.tar.bz2
+9c51cc569de37085da1af39750a35ba7  qt-copy-patches-20090112svn.tar.bz2


--- qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch DELETED ---