rpms/qt/devel qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch, NONE, 1.1 qt.spec, 1.232, 1.233

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22527

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch 
Log Message:
* Sun Feb 22 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.0-0.5.rc1
- revert license, change won't land until official 4.5.0 release
- workaround broken qhostaddress.h (#485677)


qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch ---
diff -up qt-x11-opensource-src-4.5.0-rc1/src/network/kernel/qhostaddress.h.qhostaddress qt-x11-opensource-src-4.5.0-rc1/src/network/kernel/qhostaddress.h
--- qt-x11-opensource-src-4.5.0-rc1/src/network/kernel/qhostaddress.h.qhostaddress	2009-02-04 10:05:29.000000000 -0600
+++ qt-x11-opensource-src-4.5.0-rc1/src/network/kernel/qhostaddress.h	2009-02-22 13:32:08.000000000 -0600
@@ -37,6 +37,7 @@
 #ifndef QHOSTADDRESS_H
 #define QHOSTADDRESS_H
 
+#include <QtCore/qpair.h>
 #include <QtCore/qstring.h>
 #include <QtNetwork/qabstractsocket.h>
 


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- qt.spec	21 Feb 2009 02:21:22 -0000	1.232
+++ qt.spec	22 Feb 2009 19:53:05 -0000	1.233
@@ -12,10 +12,14 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 0.4.rc1%{?dist}
+Release: 0.5.rc1%{?dist}
+
+## for 4.5.0 final:
+##License: LGPLv2 or GPLv3 with exceptions
+## but, until then,
+# see GPL_EXCEPTIONS*.txt 
+License: GPLv3 with exceptions or GPLv2 with exceptions
 
-# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
-License: LGPLv2 or GPLv3 with exceptions
 Group: System Environment/Libraries
 Url: http://www.trolltech.com/products/qt/
 Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}%{?pre}.tar.bz2
@@ -43,6 +47,10 @@
 patch11: qt-x11-opensource-src-4.5.0-rc1-misc.patch
 Patch12: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
 
+## upstreamable bits
+# http://bugzilla.redhat.com/485677
+Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
+
 ## qt-copy patches
 %define qt_copy 20090220
 Source1: qt-copy-patches-svn_checkout.sh
@@ -307,6 +315,8 @@
 %patch11 -p1 -b .misc
 %patch12 -p1 -b .ppc64
 
+%patch50 -p1 -b .qhostaddress
+
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
 
@@ -770,6 +780,10 @@
 
 
 %changelog
+* Sun Feb 22 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.0-0.5.rc1
+- revert license, change won't land until official 4.5.0 release
+- workaround broken qhostaddress.h (#485677)
+
 * Fri Feb 20 2009 Rex Dieter <rdieter at fedoraproject.org> 4.5.0-0.4.rc1
 - saner versioned Obsoletes
 - -gtkstyle, Obsoletes: qgtkstyle < 0.1