- rel 6; some fixes from git

[packages/qt4.git] / qt4.spec

diff --git a/qt4.spec b/qt4.spec
index 217f04ea8111d19cc4fd0913338f383333f5bd0c..02cee544b1ab741d65de0166c3e35795f002437b 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -56,7 +56,7 @@ Summary(pl.UTF-8):    Biblioteka Qt do tworzenia GUI
 Summary(pt_BR.UTF-8):  Estrutura para rodar aplicações GUI Qt
 Name:          qt4
 Version:       4.8.0
-Release:       1
+Release:       6
 License:       LGPL v2.1 or GPL v3.0
 Group:         X11/Libraries
 Source0:       http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
@@ -81,20 +81,21 @@ Patch6:             %{name}-build-lib-static.patch
 Patch7:                %{name}-x11_fonts.patch
 Patch8:                %{name}-pl-update.patch
 Patch9:                %{name}-ibase.patch
+Patch10:       %{name}-git.patch
 Patch11:       qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 URL:           http://qt.nokia.com/
 %{?with_ibase:BuildRequires:   Firebird-devel}
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: alsa-lib-devel
 %{?with_cups:BuildRequires:    cups-devel}
-BuildRequires: dbus-devel >= 0.62
+BuildRequires: dbus-devel >= 0.93
 BuildRequires: fontconfig-devel
 BuildRequires: freetds-devel
 BuildRequires: freetype-devel >= 1:2.0.0
 %{?with_pch:BuildRequires:     gcc >= 5:4.0}
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: gstreamer-plugins-base-devel
-%{?with_gtk:BuildRequires:     gtk+2-devel}
+%{?with_gtk:BuildRequires:     gtk+2-devel >= 2:2.10}
 BuildRequires: libicu-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libmng-devel >= 1.0.0
@@ -256,6 +257,7 @@ biblioteka statyczna.
 Summary:       Qt core classes used by other modules
 Summary(pl.UTF-8):     Podstawowe klasy Qt używane przez inne moduły
 Group:         X11/Libraries
+%requires_eq   libicu
 Obsoletes:     QtAssistant
 
 %description -n QtCore
@@ -368,6 +370,7 @@ językiem zorientowanym na JavaScript.
 Summary:       Development files for QtDeclarative - QML language engine library
 Summary(pl.UTF-8):     Pliki programistyczne QtDeclarative - biblioteki języka QML
 Group:         X11/Development/Libraries
+Requires:      QtDeclarative = %{version}-%{release}
 Requires:      QtGui-devel = %{version}-%{release}
 Requires:      QtNetwork-devel = %{version}-%{release}
 Requires:      QtScript-devel = %{version}-%{release}
@@ -1399,6 +1402,7 @@ Programas exemplo para o Qt versão.
 %patch7 -p1
 #%patch8 -p1
 %patch9 -p1
+%patch10 -p1
 %patch11 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
@@ -1414,7 +1418,7 @@ Programas exemplo para o Qt versão.
        s|QMAKE_CXXFLAGS_RELEASE.*|QMAKE_CXXFLAGS_RELEASE\t+= %{rpmcppflags} %{rpmcxxflags}|;
        s|QMAKE_CFLAGS_DEBUG.*|QMAKE_CFLAGS_DEBUG\t+= %{debugcflags}|;
        s|QMAKE_CXXFLAGS_DEBUG.*|QMAKE_CXXFLAGS_DEBUG\t+= %{debugcflags}|;
-       ' mkspecs/common/g++.conf
+       ' mkspecs/common/g++-base.conf
 
 %{__sed} -i -e '
        s|QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT       = %{_includedir}/qt4|;