- revert license, change won't land until official 4.5.0 release
- workaround broken qhostaddress.h (#485677)
This commit is contained in:
parent
c5c71b0706
commit
747f1a22bd
11
qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
Normal file
11
qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
Normal file
@ -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>
|
||||||
|
|
20
qt.spec
20
qt.spec
@ -12,10 +12,14 @@ Epoch: 1
|
|||||||
Name: qt4
|
Name: qt4
|
||||||
%endif
|
%endif
|
||||||
Version: 4.5.0
|
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
|
Group: System Environment/Libraries
|
||||||
Url: http://www.trolltech.com/products/qt/
|
Url: http://www.trolltech.com/products/qt/
|
||||||
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}%{?pre}.tar.bz2
|
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
|
patch11: qt-x11-opensource-src-4.5.0-rc1-misc.patch
|
||||||
Patch12: qt-x11-opensource-src-4.5.0-rc1-ppc64.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
|
## qt-copy patches
|
||||||
%define qt_copy 20090220
|
%define qt_copy 20090220
|
||||||
Source1: qt-copy-patches-svn_checkout.sh
|
Source1: qt-copy-patches-svn_checkout.sh
|
||||||
@ -307,6 +315,8 @@ test -x apply_patches && ./apply_patches
|
|||||||
%patch11 -p1 -b .misc
|
%patch11 -p1 -b .misc
|
||||||
%patch12 -p1 -b .ppc64
|
%patch12 -p1 -b .ppc64
|
||||||
|
|
||||||
|
%patch50 -p1 -b .qhostaddress
|
||||||
|
|
||||||
# drop -fexceptions from $RPM_OPT_FLAGS
|
# drop -fexceptions from $RPM_OPT_FLAGS
|
||||||
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
|
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
|
%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
|
* Fri Feb 20 2009 Rex Dieter <rdieter@fedoraproject.org> 4.5.0-0.4.rc1
|
||||||
- saner versioned Obsoletes
|
- saner versioned Obsoletes
|
||||||
- -gtkstyle, Obsoletes: qgtkstyle < 0.1
|
- -gtkstyle, Obsoletes: qgtkstyle < 0.1
|
||||||
|
Loading…
Reference in New Issue
Block a user