]> git.pld-linux.org Git - packages/qt4.git/blobdiff - qt4.spec
projects / packages / qt4.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- rel 6; some fixes from git
[packages/qt4.git] / qt4.spec
diff --git a/qt4.spec b/qt4.spec
index f647b065149b9368e7479de4765b02bda742987d..02cee544b1ab741d65de0166c3e35795f002437b 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -7,17 +7,6 @@
 #      - check Qt ui tool
 #      - QtWebKit-devel is broken: libQtWebKit.*la contains '-ljscore', it comes
 #        from src/3rdparty/webkit/JavaScriptCore, but jscore lib isn't installed
-# - QtDBus (and maybe others) not multilib compatible (split pkgs or drop symlinks)
-#   file /usr/bin/qdbus from install of QtDBus-4.5.0-7.i686 conflicts with file from package QtDBus-4.5.0-7.x86_64
-#   file /usr/bin/qdbusviewer from install of QtDBus-4.5.0-7.i686 conflicts with file from package QtDBus-4.5.0-7.x86_64
-#   $ rpm -q QtDBus --filecolor|less
-#   /usr/bin/qdbus  0
-#   /usr/bin/qdbusviewer    0
-#   $ file /usr/bin/qdbus /usr/bin/qdbusviewer
-#   /usr/bin/qdbus:       symbolic link to `../lib/qt4/bin/qdbus'
-#   /usr/bin/qdbusviewer: symbolic link to `../lib/qt4/bin/qdbusviewer'
-#   MORAL: it would be ok if the files were marked as multilib (colors 1 or 2), not symlinks (color 0)
-#   I personally would moved binaries to %{_bindir}
 #
 # Conditional build:
 %bcond_with    nas             # enable NAS audio support
@@ -66,12 +55,12 @@ Summary(es.UTF-8):  Biblioteca para ejecutar aplicaciones GUI Qt
 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.7.2
-Release:       2
+Version:       4.8.0
+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
-# Source0-md5: 66b992f5c21145df08c99d21847f4fdb
+# Source0-md5: e8a5fdbeba2927c948d9f477a6abe904
 Source2:       %{name}-qtconfig.desktop
 Source3:       %{name}-designer.desktop
 Source4:       %{name}-assistant.desktop
@@ -86,36 +75,38 @@ Patch0:             %{name}-tools.patch
 Patch1:                %{name}-qt_copy.patch
 Patch2:                %{name}-buildsystem.patch
 Patch3:                %{name}-locale.patch
-Patch4:                %{name}-antialias.patch
+Patch4:                %{name}-qvfb.patch
 Patch5:                %{name}-support-cflags-with-commas.patch
 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
 BuildRequires: libpng-devel >= 2:1.0.8
-BuildRequires: pulseaudio-devel >= 0.9.10
 BuildRequires: libstdc++-devel
 %{?with_mysql:BuildRequires:   mysql-devel}
 %{?with_nas:BuildRequires:     nas-devel}
 BuildRequires: pkgconfig
 %{?with_pgsql:BuildRequires:   postgresql-backend-devel}
 %{?with_pgsql:BuildRequires:   postgresql-devel}
+BuildRequires: pulseaudio-devel >= 0.9.10
 BuildRequires: rpmbuild(macros) >= 1.602
 BuildRequires: sed >= 4.0
 %{?with_sqlite:BuildRequires:  sqlite-devel}
@@ -266,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
@@ -378,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}
@@ -1322,6 +1315,7 @@ Requires: QtGui = %{version}-%{release}
 Requires:      QtNetwork = %{version}-%{release}
 Requires:      QtSql = %{version}-%{release}
 Requires:      QtXml = %{version}-%{release}
+Requires:      desktop-file-utils
 
 %description qtconfig
 A tool for configuring look and behavior of Qt widgets.
@@ -1408,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 \
@@ -1423,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|;
@@ -1439,6 +1434,9 @@ Programas exemplo para o Qt versão.
        s|^QMAKE_STRIP.*=.*|QMAKE_STRIP             =|;
        ' mkspecs/common/linux.conf
 
+# disable webkit tests, broken build
+rm -r src/3rdparty/webkit/Source/WebKit/qt/tests
+
 %build
 # pass OPTFLAGS to build qmake itself with optimization
 export OPTFLAGS="%{rpmcflags}"
@@ -1449,7 +1447,6 @@ export PATH=$PWD/bin:$PATH
 ##################################
 
 COMMONOPT=" \
-       -DQT_CLEAN_NAMESPACE \
        -buildkey pld \
        -verbose \
        -prefix %{_qtdir} \
@@ -1464,6 +1461,8 @@ COMMONOPT=" \
        -sysconfdir %{_sysconfdir}/qt4 \
        -examplesdir %{_examplesdir}/qt4 \
        -demosdir %{_examplesdir}/qt4-demos \
+       -opensource \
+       -optimized-qmake \
        -fast \
        -glib \
        %{!?with_gtk:-no-gtkstyle} \
@@ -1479,13 +1478,16 @@ COMMONOPT=" \
        %{!?with_sse42:-no-sse4.2} \
        %{!?with_avx:-no-avx} \
        -qdbus \
-       -qt-gif \
+       -dbus-linked \
        -reduce-relocations \
        -system-libjpeg \
        -system-libmng \
        -system-libpng \
+       -system-libtiff \
        -system-zlib \
+       -openssl-linked \
        -exceptions \
+       -graphicssystem raster \
        -largefile \
        -I/usr/include/postgresql/server \
        -I/usr/include/mysql \
@@ -1495,13 +1497,17 @@ COMMONOPT=" \
        %{!?debug:-release} \
        -qt3support \
        -fontconfig \
+       -largefile \
        -iconv \
+       -icu \
        -no-separate-debug-info \
        -xfixes \
        -nis \
        -sm \
        -xcursor \
        -xinput \
+       -xinerama \
+       -xrandr \
        -xkb \
        -xrender \
        -xshape \
@@ -1595,18 +1601,23 @@ ln -sf ../%{_lib}/qt4/bin/qt3to4 .
 ln -sf ../%{_lib}/qt4/bin/rcc .
 ln -sf ../%{_lib}/qt4/bin/uic3 .
 ln -sf ../%{_lib}/qt4/bin/pixeltool .
-ln -sf ../%{_lib}/qt4/bin/qdbus .
+ln -sf ../%{_lib}/qt4/bin/qcollectiongenerator .
 ln -sf ../%{_lib}/qt4/bin/qdbuscpp2xml .
 ln -sf ../%{_lib}/qt4/bin/qdbusxml2cpp .
-ln -sf ../%{_lib}/qt4/bin/qdbusviewer .
 ln -sf ../%{_lib}/qt4/bin/qhelpconverter .
 ln -sf ../%{_lib}/qt4/bin/qhelpgenerator .
 ln -sf ../%{_lib}/qt4/bin/qmlviewer .
+ln -sf ../%{_lib}/qt4/bin/qmlplugindump .
 ln -sf ../%{_lib}/qt4/bin/qttracereplay .
 ln -sf ../%{_lib}/qt4/bin/qvfb .
 ln -sf ../%{_lib}/qt4/bin/xmlpatternsvalidator .
 cd -
 
+# multilib
+mv $RPM_BUILD_ROOT%{_qtdir}/bin/{qdbus,qdbusviewer} $RPM_BUILD_ROOT%{_bindir}
+ln -sf %{_bindir}/qdbus $RPM_BUILD_ROOT%{_qtdir}/bin/qdbus
+ln -sf %{_bindir}/qdbusviewer $RPM_BUILD_ROOT%{_qtdir}/bin/qdbusviewer
+
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/qtconfig-qt4.desktop
 install tools/qtconfig/images/appicon.png \
        $RPM_BUILD_ROOT%{_pixmapsdir}/qtconfig-qt4.png
@@ -1852,6 +1863,9 @@ rm -rf $RPM_BUILD_ROOT
 %post  phonon          -p /sbin/ldconfig
 %postun        phonon          -p /sbin/ldconfig
 
+%post qtconfig
+%update_desktop_database
+
 %files -n Qt3Support
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt3Support.so.*.*
@@ -1881,11 +1895,14 @@ rm -rf $RPM_BUILD_ROOT
 %lang(da) %{_datadir}/locale/da/LC_MESSAGES/qt4.qm
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/qt4.qm
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/qt4.qm
+%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/qt4.qm
 %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/qt4.qm
 %lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/qt4.qm
 %lang(he) %{_datadir}/locale/he/LC_MESSAGES/qt4.qm
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/qt4.qm
 %lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/qt4.qm
+%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/qt4.qm
+%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/qt4.qm
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4.qm
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/qt4.qm
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/qt4.qm
@@ -1910,7 +1927,9 @@ rm -rf $RPM_BUILD_ROOT
 %files -n QtDeclarative
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qmlviewer
+%attr(755,root,root) %{_bindir}/qmlplugindump
 %attr(755,root,root) %{_qtdir}/bin/qmlviewer
+%attr(755,root,root) %{_qtdir}/bin/qmlplugindump
 %attr(755,root,root) %{_libdir}/libQtDeclarative.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQtDeclarative.so.4
 %dir %{_qtdir}/imports
@@ -1919,13 +1938,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_qtdir}/imports/Qt/labs/folderlistmodel
 %dir %{_qtdir}/imports/Qt/labs/gestures
 %dir %{_qtdir}/imports/Qt/labs/particles
+%dir %{_qtdir}/imports/Qt/labs/shaders
 %attr(755,root,root) %{_qtdir}/imports/Qt/labs/*/*.so
 %{_qtdir}/imports/Qt/labs/*/qmldir
 %dir %{_qtdir}/imports/QtWebKit
 %attr(755,root,root) %{_qtdir}/imports/QtWebKit/*.so
 %{_qtdir}/imports/QtWebKit/qmldir
 %dir %{_qtdir}/plugins/qmltooling
-%attr(755,root,root) %{_qtdir}/plugins/qmltooling/libtcpserver.so
+%attr(755,root,root) %{_qtdir}/plugins/qmltooling/libqmldbg_tcp.so
+%attr(755,root,root) %{_qtdir}/plugins/qmltooling/libqmldbg_inspector.so
 
 %files -n QtDesigner
 %defattr(644,root,root,755)
@@ -1950,6 +1971,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_qtdir}/plugins/imageformats/libqico.so
 %attr(755,root,root) %{_qtdir}/plugins/imageformats/libqjpeg.so
 %attr(755,root,root) %{_qtdir}/plugins/imageformats/libqmng.so
+%attr(755,root,root) %{_qtdir}/plugins/imageformats/libqtga.so
 %attr(755,root,root) %{_qtdir}/plugins/imageformats/libqtiff.so
 %dir %{_qtdir}/plugins/inputmethods
 %attr(755,root,root) %{_qtdir}/plugins/inputmethods/*.so
@@ -1966,8 +1988,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(da) %{_datadir}/locale/da/LC_MESSAGES/qt4-qt_help.qm
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/qt4-qt_help.qm
 %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/qt4-qt_help.qm
+%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/qt4-qt_help.qm
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/qt4-qt_help.qm
 %lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/qt4-qt_help.qm
+%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/qt4-qt_help.qm
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-qt_help.qm
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/qt4-qt_help.qm
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/qt4-qt_help.qm
@@ -2087,17 +2111,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files assistant
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/pixeltool
 %attr(755,root,root) %{_bindir}/assistant-qt4
+%attr(755,root,root) %{_bindir}/pixeltool
+%attr(755,root,root) %{_bindir}/qcollectiongenerator
+%attr(755,root,root) %{_qtdir}/bin/assistant
 %attr(755,root,root) %{_qtdir}/bin/pixeltool
 %attr(755,root,root) %{_qtdir}/bin/qcollectiongenerator
-%attr(755,root,root) %{_qtdir}/bin/assistant
 %lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/qt4-assistant.qm
 %lang(da) %{_datadir}/locale/da/LC_MESSAGES/qt4-assistant.qm
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/qt4-assistant.qm
 %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/qt4-assistant.qm
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/qt4-assistant.qm
 %lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/qt4-assistant.qm
+%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/qt4-assistant.qm
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-assistant.qm
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/qt4-assistant.qm
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/qt4-assistant.qm
@@ -2133,6 +2159,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/qt4-designer.qm
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/qt4-designer.qm
 %lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/qt4-designer.qm
+%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/qt4-designer.qm
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-designer.qm
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/qt4-designer.qm
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/qt4-designer.qm
@@ -2158,6 +2185,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/qt4-linguist.qm
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/qt4-linguist.qm
 %lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/qt4-linguist.qm
+%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/qt4-linguist.qm
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-linguist.qm
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/qt4-linguist.qm
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/qt4-linguist.qm
@@ -2190,6 +2218,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_qtdir}/bin/qtconfig
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/qt4-qtconfig.qm
 %lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/qt4-qtconfig.qm
+%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/qt4-qtconfig.qm
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-qtconfig.qm
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/qt4-qtconfig.qm
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/qt4-qtconfig.qm
@@ -2205,6 +2234,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_qtdir}/bin/qvfb
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/qt4-qvfb.qm
 %lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/qt4-qvfb.qm
+%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/qt4-qvfb.qm
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-qvfb.qm
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/qt4-qvfb.qm
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/qt4-qvfb.qm
@@ -2350,9 +2380,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libQtUiTools.a
 
-#%files -n QtWebKit-static
-#%defattr(644,root,root,755)
-#%{_libdir}/libQtWebKit.a
+%files -n QtWebKit-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtWebKit.a
 
 %files -n QtDeclarative-static
 %defattr(644,root,root,755)
The Qt GUI application framework
This page took 0.054304 seconds and 4 git commands to generate.