From 747f1a22bd2856aa90f2ea9d259018ba029a285c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sun, 22 Feb 2009 19:53:05 +0000
Subject: [PATCH] - revert license, change won't land until official 4.5.0
 release - workaround broken qhostaddress.h (#485677)

---
 ...pensource-src-4.5.0-rc1-qhostaddress.patch | 11 ++++++++++
 qt.spec                                       | 20 ++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch

diff --git a/qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch b/qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
new file mode 100644
index 0000000..dd25621
--- /dev/null
+++ b/qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
@@ -0,0 +1,11 @@
+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>
+ 
diff --git a/qt.spec b/qt.spec
index 45bb206..21081e9 100644
--- a/qt.spec
+++ b/qt.spec
@@ -12,10 +12,14 @@ Epoch:   1
 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 @@ Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
 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 @@ test -x apply_patches && ./apply_patches
 %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 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %changelog
+* Sun Feb 22 2009 Rex Dieter <rdieter@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@fedoraproject.org> 4.5.0-0.4.rc1
 - saner versioned Obsoletes
 - -gtkstyle, Obsoletes: qgtkstyle < 0.1