|
@@ -7,15 +7,15 @@
|
|
|
Summary: Qt toolkit
|
|
|
Summary(ja): Qt ツールキット
|
|
|
Name: qt4
|
|
|
-Version: 4.8.5
|
|
|
-Release: 4%{?_dist_release}
|
|
|
+Version: 4.8.6
|
|
|
+Release: 1%{?_dist_release}
|
|
|
|
|
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
|
|
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
|
|
Group: System Environment/Libraries
|
|
|
URL: http://qt.nokia.com/
|
|
|
|
|
|
-Source0: http://get.qt.nokia.com/qt/source/qt-%{type}-%{version}.tar.gz
|
|
|
+Source0: http://download.qt-project.org/official_releases/qt/4.8/%{version}/qt-%{type}-%{version}.tar.gz
|
|
|
|
|
|
# default Qt config file
|
|
|
Source4: Trolltech.conf
|
|
@@ -55,7 +55,7 @@ Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
|
|
|
|
|
|
# fix invalid assumptions about mysql_config --libs
|
|
|
# http://bugzilla.redhat.com/440673
|
|
|
-Patch54: qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch
|
|
|
+Patch54: qt-everywhere-opensource-src-4.8.5-mysql_config.patch
|
|
|
|
|
|
# http://bugs.kde.org/show_bug.cgi?id=180051#c22
|
|
|
Patch55: qt-everywhere-opensource-src-4.6.2-cups.patch
|
|
@@ -67,7 +67,7 @@ Patch64: qt-everywhere-opensource-src-4.8.5-QTBUG-14467.patch
|
|
|
Patch65: qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch
|
|
|
|
|
|
# fix the outdated standalone copy of JavaScriptCore
|
|
|
-Patch67: qt-everywhere-opensource-src-4.8.0-beta1-s390.patch
|
|
|
+Patch67: qt-everywhere-opensource-src-4.8.6-s390.patch
|
|
|
|
|
|
# https://bugs.webkit.org/show_bug.cgi?id=63941
|
|
|
# -Wall + -Werror = fail
|
|
@@ -92,9 +92,6 @@ Patch76: qt-everywhere-opensource-src-4.8.0-s390-atomic.patch
|
|
|
# don't spam if libicu is not present at runtime
|
|
|
Patch77: qt-everywhere-opensource-src-4.8.0-icu_no_spam.patch
|
|
|
|
|
|
-# gcc doesn't support flag -fuse-ld=gold
|
|
|
-Patch80: qt-everywhere-opensource-src-4.8.0-ld-gold.patch
|
|
|
-
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=810500
|
|
|
Patch81: qt-everywhere-opensource-src-4.8.2--assistant-crash.patch
|
|
|
|
|
@@ -183,7 +180,7 @@ BuildRequires: firebird-devel
|
|
|
%endif
|
|
|
|
|
|
%if "%{?mysql}" != "-no-sql-mysql"
|
|
|
-BuildRequires: MySQL-devel >= 4.0
|
|
|
+BuildRequires: libmysqlclient-devel
|
|
|
%endif
|
|
|
|
|
|
%if "%{?phonon_backend}" == "-phonon-backend"
|
|
@@ -192,7 +189,7 @@ BuildRequires: gstreamer-plugins-base-devel >= 0.10
|
|
|
%endif
|
|
|
|
|
|
%if "%{?psql}" != "-no-sql-psql"
|
|
|
-BuildRequires: postgresql-devel
|
|
|
+BuildRequires: libpq-devel
|
|
|
BuildRequires: krb5-devel libxslt-devel pam-devel
|
|
|
BuildRequires: readline-devel
|
|
|
%endif
|
|
@@ -417,7 +414,6 @@ popd
|
|
|
%patch75 -p1 -b .ppc64-crash
|
|
|
%patch76 -p1 -b .s390-atomic
|
|
|
%patch77 -p1 -b .icu_no_spam
|
|
|
-%patch80 -p1 -b .ld.gold
|
|
|
%patch81 -p1 -b .assistant-crash
|
|
|
%patch82 -p1 -b .QTBUG-4862
|
|
|
|
|
@@ -909,6 +905,7 @@ fi
|
|
|
%{_qt4_plugindir}/sqldrivers/libqsqlite*
|
|
|
%dir %{_qt4_translationdir}
|
|
|
%{_qt4_translationdir}/qt_*.qm
|
|
|
+%{_qt4_translationdir}/qtscript_*.qm
|
|
|
%{_datadir}/icons/hicolor/*/apps/qt4-logo.*
|
|
|
|
|
|
%files config
|
|
@@ -1090,6 +1087,13 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Jul 11 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.6-1
|
|
|
+- new upstream release
|
|
|
+- change BuildRequires: libmysqlclient-devel instead of MySQL-devel
|
|
|
+- change BuildRequires: libpq-devel instead of postgresql-devel
|
|
|
+- update Patch54,67 from fedora
|
|
|
+- remove Patch80 (qt-everywhere-opensource-src-4.8.0-ld-gold.patch)
|
|
|
+
|
|
|
* Mon Jan 13 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.5-4
|
|
|
- fix BTS:2677
|
|
|
|