- 4.4 moved from DEVEL to HEAD. HEAD tagged with QT_4_3.

Changed files:
    qt4.spec -> 1.164

diff --git a/qt4.spec b/qt4.spec
index 82338748bee053242276f74655835308b90e5341..add37fafb9d71201cf6318475524414077a712db 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -4,6 +4,10 @@
 #      - more cleanups
 #      - check if translations are available
 #      - check Qt ui tool
+#--- qt4.spec:auto-th-qt4-4_4_0-1:
+#upgrading packages
+#error: Failed dependencies:
+#        /usr/lib64/qt4/plugins/script is needed by QtDBus-4.4.0-1.x86_64
 #
 # Conditional build:
 %bcond_with    nas             # enable NAS audio support
@@ -34,17 +38,18 @@
 %define                _withsql        1
 %{!?with_sqlite3:%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine _withsql}}}}}}
 
+%define                rel     3
 Summary:       The Qt GUI application framework
 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.3.4
-Release:       4
+Version:       4.4.0
+Release:       %{rel}
 License:       GPL v2 with OSS exception or QPL v1
 Group:         X11/Libraries
 Source0:       ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
-# Source0-md5: 9499101ec54eb7b0de195b3c5e3ffa93
+# Source0-md5: f13ad0aa75efad314715930e663bad55
 Source2:       %{name}-qtconfig.desktop
 Source3:       %{name}-designer.desktop
 Source4:       %{name}-assistant.desktop
@@ -59,6 +64,7 @@ Patch6:               %{name}-build-lib-static.patch
 Patch7:                %{name}-x11_fonts.patch
 Patch8:                %{name}-pl-update.patch
 Patch9:                %{name}-ibase.patch
+Patch10:       %{name}-pg_libs.patch
 URL:           http://www.trolltech.com/products/qt/
 %{?with_ibase:BuildRequires:   Firebird-devel}
 BuildRequires: OpenGL-GLU-devel
@@ -71,6 +77,7 @@ BuildRequires:        freetype-devel >= 1:2.0.0
 %{?with_pch:BuildRequires:     gcc >= 5:4.0}
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel >= 2.0.0
+BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libmng-devel >= 1.0.0
 BuildRequires: libpng-devel >= 2:1.0.8
@@ -80,6 +87,7 @@ BuildRequires:        libstdc++-devel
 BuildRequires: pkgconfig
 %{?with_pgsql:BuildRequires:   postgresql-backend-devel}
 %{?with_pgsql:BuildRequires:   postgresql-devel}
+%{?with_pgsql:BuildRequires:   postgresql-static}
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: sed >= 4.0
 %{?with_sqlite:BuildRequires:  sqlite-devel}
@@ -92,8 +100,10 @@ BuildRequires:      xorg-lib-libXi-devel
 BuildRequires: xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXrandr-devel
 BuildRequires: xorg-lib-libXrender-devel
+BuildRequires: xorg-lib-libXtst-devel
 BuildRequires: zlib-devel
-BuildConflicts:        QtCore-devel < 4.3.2
+BuildConflicts:        QtCore-devel <= %{version}
+BuildConflicts:        QtScript-devel <= %{version}
 Obsoletes:     qt-extensions
 Obsoletes:     qt-utils
 Conflicts:     kdelibs <= 8:3.2-0.030602.1
@@ -155,6 +165,8 @@ Summary:    Core classes used by other modules - development files
 Summary(pl.UTF-8):     Podstawowe klasy używane przez inne moduły - pliki programistyczne
 Group:         X11/Development/Libraries
 Requires:      QtCore = %{version}-%{release}
+Requires:      QtXml-devel = %{version}-%{release}
+Requires:      QtXmlPatterns-devel = %{version}-%{release}
 Requires:      glib2-devel
 Requires:      libstdc++-devel
 Requires:      zlib-devel
@@ -518,6 +530,18 @@ Test framework - development files.
 %description -n QtTest-devel -l pl.UTF-8
 Szkielet testów - pliki programistyczne.
 
+%package -n QtTest-static
+Summary:       Test framework - static libraries
+Summary(pl.UTF-8):     Szkielet testów - biblioteki statyczne
+Group:         X11/Development/Libraries
+Requires:      QtTest-devel = %{version}-%{release}
+
+%description -n QtTest-static
+Test framework - static libraries.
+
+%description -n QtTest-static -l pl.UTF-8
+Szkielet testów - biblioteki statyczne.
+
 %package -n QtXml
 Summary:       Classes for handling XML
 Summary(pl.UTF-8):     Klasy do obsługi XML-a
@@ -812,6 +836,104 @@ library.
 Klasy do obsługi formularzy Qt Designera w aplikacjach - biblioteka
 statyczna.
 
+%package -n QtHelp
+Summary:       QtHelp
+Group:         X11/Libraries
+Requires:      QtGui = %{version}-%{release}
+
+%description -n QtHelp
+QtHelp.
+
+%package -n QtHelp-devel
+Summary:       QtHelp - development files
+Group:         X11/Development/Libraries
+Requires:      QtCore-devel = %{version}-%{release}
+
+%description -n QtHelp-devel
+QtHelp - development files.
+
+%package -n QtHelp-static
+Summary:       QtHelp - static libraries
+Group:         X11/Development/Libraries
+Requires:      QtCore-devel = %{version}-%{release}
+
+%description -n QtHelp-static
+QtHelp - static libraries.
+
+%package -n QtWebKit
+Summary:       QtWebKit
+Group:         X11/Libraries
+Requires:      QtGui = %{version}-%{release}
+
+%description -n QtWebKit
+QtWebKit.
+
+%package -n QtWebKit-devel
+Summary:       QtWebKit - development files
+Group:         X11/Development/Libraries
+Requires:      QtCore-devel = %{version}-%{release}
+
+%description -n QtWebKit-devel
+QtWebKit - development files.
+
+%package -n QtWebKit-static
+Summary:       QtWebKit - static libraries
+Group:         X11/Development/Libraries
+Requires:      QtCore-devel = %{version}-%{release}
+
+%description -n QtWebKit-static
+QtWebKit - static libraries.
+
+%package -n QtCLucene
+Summary:       QtCLucene
+Group:         X11/Libraries
+Requires:      QtGui = %{version}-%{release}
+
+%description -n QtCLucene
+QtCLucene.
+
+%package -n QtCLucene-devel
+Summary:       QtCLucene - development files
+Group:         X11/Development/Libraries
+Requires:      QtCLucene = %{version}-%{release}
+Requires:      QtCore-devel = %{version}-%{release}
+
+%description -n QtCLucene-devel
+QtCLucene - development files.
+
+%package -n QtCLucene-static
+Summary:       QtCLucene - static libraries
+Group:         X11/Development/Libraries
+Requires:      QtCore-devel = %{version}-%{release}
+
+%description -n QtCLucene-static
+QtCLucene - static libraries.
+
+%package -n QtXmlPatterns
+Summary:       QtXmlPatterns
+Group:         X11/Libraries
+Requires:      QtGui = %{version}-%{release}
+
+%description -n QtXmlPatterns
+QtXmlPatterns.
+
+%package -n QtXmlPatterns-devel
+Summary:       QtXmlPatterns - development files
+Group:         X11/Development/Libraries
+Requires:      QtCore-devel = %{version}-%{release}
+Requires:      QtXmlPatterns = %{version}-%{release}
+
+%description -n QtXmlPatterns-devel
+QtXmlPatterns - development files.
+
+%package -n QtXmlPatterns-static
+Summary:       QtXmlPatterns - static libraries
+Group:         X11/Development/Libraries
+Requires:      QtCore-devel = %{version}-%{release}
+
+%description -n QtXmlPatterns-static
+QtXmlPatterns - static libraries.
+
 %package assistant
 Summary:       Qt documentation browser
 Summary(pl.UTF-8):     Przeglądarka dokumentacji Qt
@@ -881,6 +1003,22 @@ przeznaczone do tłumaczenia i przedstawia w łatwym w obsłudze oknie.
 Gdy jeden z nich jest już przetłumaczony, automatycznie przechodzi do
 następnego, aż wszystkie będą przetłumaczone.
 
+%package phonon
+Summary:       phonon
+Group:         X11/Development/Tools
+
+%description phonon
+phonon.
+
+%package phonon-devel
+Summary:       phonon - development files
+Group:         X11/Development/Libraries
+Requires:      QtCore-devel = %{version}-%{release}
+Requires:      qt4-phonon = %{version}-%{release}
+
+%description phonon-devel
+phonon - development files.
+
 %package qmake
 Summary:       Qt makefile generator
 Summary(pl.UTF-8):     Generator plików makefile dla aplikacji Qt
@@ -977,8 +1115,9 @@ Programas exemplo para o Qt versão.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
+#%patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
        mkspecs/common/linux.conf
@@ -1036,10 +1175,10 @@ COMMONOPT=" \
        -system-libmng \
        -system-libpng \
        -system-zlib \
-       -no-exceptions \
+       -exceptions \
        -largefile \
-       -I%{_includedir}/postgresql/server \
-       -I%{_includedir}/mysql \
+       -I/usr/include/postgresql/server \
+       -I/usr/include/mysql \
        %{?with_cups:-cups} \
        %{?with_nas:-system-nas-sound} \
        %{?debug:-debug} \
@@ -1055,7 +1194,9 @@ COMMONOPT=" \
        -xcursor \
        -xkb \
        -xrender \
-       -xshape"
+       -xshape \
+       -xmlpatterns \
+       -continue"
 
 ##################################
 #        STATIC MULTI-THREAD      #
@@ -1076,7 +1217,6 @@ echo "yes" | ./configure $COMMONOPT $OPT
 %{__make} -C src
 %{__make} -C tools/assistant/lib
 %{__make} -C tools/designer
-%{__make} -C tools/qdbus/src
 if [ ! -d staticlib ]; then
        mkdir staticlib
        cp -a lib/*.a staticlib
@@ -1154,8 +1294,6 @@ install tools/linguist/linguist/images/appicon.png \
        $RPM_BUILD_ROOT%{_pixmapsdir}/linguist-qt4.png
 
 install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/assistant-qt4.desktop
-install tools/assistant/images/assistant.png \
-       $RPM_BUILD_ROOT%{_pixmapsdir}/assistant-qt4.png
 
 install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/designer-qt4.desktop
 install tools/designer/src/designer/images/designer.png \
@@ -1175,12 +1313,11 @@ done
 rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*.qm
 for file in translations/*.qm tools/assistant/*.qm tools/designer/designer/*.qm tools/linguist/linguist/*.qm; do
        [ ! -f $file ] && continue
-       lang=`echo $file | sed -r 's:.*/[a-zA-Z]*_(.*).qm:\1:'`
-       MOD=`echo $file | sed -r 's:.*/([a-zA-Z]*)_.*.qm:\1:'`
+       eval "`echo $file | sed -r 's:.*/([a-zA-Z]+(_[a-zA-Z]{3,}){0,1})_(((ja)_jp)|([a-z]{2}_[A-Z]{2,})|([a-z]{2}))\.qm$:MOD=\1 ; lang=\5\6\7:'`"
        [ "$lang" == "iw" ] && lang=he
        MOD=qt4-$MOD
        [ "$MOD" == "qt4-qt" ] && MOD=qt4
-       install -d $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES
+       install -d $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES
        cp $file $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/$MOD.qm
 done
 
@@ -1192,9 +1329,6 @@ for f in ../Qt{3Support,Assistant,Core,DBus,Designer,Gui,Network,OpenGL,Script,S
 done
 cd -
 
-mv $RPM_BUILD_ROOT%{_datadir}/locale/ja_jp/LC_MESSAGES/qt4.qm \
-       $RPM_BUILD_ROOT%{_datadir}/locale/ja/LC_MESSAGES/qt4.qm
-
 # Ship doc & qmake stuff
 ln -s %{_docdir}/%{name}-doc $RPM_BUILD_ROOT%{_qtdir}/doc
 ln -s %{_datadir}/qt4/mkspecs $RPM_BUILD_ROOT%{_qtdir}/mkspecs
@@ -1235,6 +1369,7 @@ ifecho() {
 }
 
 mkdevfl() {
+       set -x
        MODULE=$1; shift
        echo "%%defattr(644,root,root,755)" > $MODULE-devel.files
        ifecho $MODULE-devel "%{_libdir}/lib$MODULE*.so"
@@ -1246,7 +1381,9 @@ mkdevfl() {
        fi
        for f in `find $RPM_BUILD_ROOT%{_includedir}/qt4/$MODULE -printf "%%P "`; do
                ifecho $MODULE-devel %{_includedir}/qt4/$MODULE/$f
-               ifecho $MODULE-devel %{_includedir}/qt4/Qt/$f
+               if [ -a "$RPM_BUILD_ROOT%{_includedir}/qt4/Qt/$f" ]; then
+                       ifecho $MODULE-devel %{_includedir}/qt4/Qt/$f
+               fi
        done
        for f in $@; do ifecho $MODULE-devel $f; done
 }
@@ -1260,8 +1397,13 @@ mkdevfl QtScript
 mkdevfl QtSql
 mkdevfl QtSvg
 mkdevfl QtTest
+mkdevfl        QtHelp
+mkdevfl        QtWebKit
+mkdevfl        QtCLucene
 mkdevfl QtXml
+mkdevfl QtXmlPatterns
 mkdevfl Qt3Support
+mkdevfl phonon
 
 # without *.la *.pc etc.
 mkdevfl QtAssistant || /bin/true
@@ -1311,9 +1453,21 @@ rm -rf $RPM_BUILD_ROOT
 %post  -n QtTest       -p /sbin/ldconfig
 %postun        -n QtTest       -p /sbin/ldconfig
 
+%post  -n QtHelp       -p /sbin/ldconfig
+%postun        -n QtHelp       -p /sbin/ldconfig
+
+%post  -n QtWebKit     -p /sbin/ldconfig
+%postun        -n QtWebKit     -p /sbin/ldconfig
+
+%post  -n QtCLucene    -p /sbin/ldconfig
+%postun        -n QtCLucene    -p /sbin/ldconfig
+
 %post  -n QtXml        -p /sbin/ldconfig
 %postun        -n QtXml        -p /sbin/ldconfig
 
+%post   -n QtXmlPatterns       -p /sbin/ldconfig
+%postun -n QtXmlPatterns       -p /sbin/ldconfig
+
 %post  -n Qt3Support   -p /sbin/ldconfig
 %postun        -n Qt3Support   -p /sbin/ldconfig
 
@@ -1326,6 +1480,9 @@ rm -rf $RPM_BUILD_ROOT
 %post  -n QtUiTools    -p /sbin/ldconfig
 %postun        -n QtUiTools    -p /sbin/ldconfig
 
+%post  phonon          -p /sbin/ldconfig
+%postun        phonon          -p /sbin/ldconfig
+
 %files -n QtCore
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQtCore.so.*.*
@@ -1341,6 +1498,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_qtdir}/plugins/inputmethods
 %dir %{_qtdir}/plugins/network
 %dir %{_qtdir}/plugins/sqldrivers
+%dir %{_qtdir}/plugins/script
 %dir %{_datadir}/qt4
 %lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/qt4.qm
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/qt4.qm
@@ -1355,6 +1513,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/qt4.qm
 %lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/qt4.qm
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/qt4.qm
+%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/qt4.qm
 
 %files -n QtDBus
 %defattr(644,root,root,755)
@@ -1364,6 +1523,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libQtDBus.so.4
 %attr(755,root,root) %{_qtdir}/bin/qdbus
 %attr(755,root,root) %{_qtdir}/bin/qdbusviewer
+# ?? is this the proper place?
+%attr(755,root,root) %{_qtdir}/plugins/script/libqtscriptdbus.so
 
 %files -n QtGui
 %defattr(644,root,root,755)
@@ -1446,6 +1607,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libQtXml.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQtXml.so.4
 
+%files -n QtXmlPatterns
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_qtdir}/bin/xmlpatterns
+%attr(755,root,root) %{_libdir}/libQtXmlPatterns.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQtXmlPatterns.so.4
+
 %files -n Qt3Support
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt3Support.so.*.*
@@ -1470,18 +1637,41 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libQtUiTools.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQtUiTools.so.4
 
+%files -n QtCLucene
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQtCLucene.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQtCLucene.so.4
+
+%files -n QtHelp
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQtHelp.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQtHelp.so.4
+%attr(755,root,root) %{_qtdir}/bin/qhelpconverter
+%attr(755,root,root) %{_qtdir}/bin/qhelpgenerator
+%lang(de) %{_datadir}/locale/de/LC_MESSAGES/qt4-qt_help.qm
+%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-qt_help.qm
+%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/qt4-qt_help.qm
+%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/qt4-qt_help.qm
+
+%files -n QtWebKit
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQtWebKit.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQtWebKit.so.4
+
 %files assistant
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pixeltool
 %attr(755,root,root) %{_bindir}/assistant-qt4
 %attr(755,root,root) %{_qtdir}/bin/pixeltool
+%attr(755,root,root) %{_qtdir}/bin/qcollectiongenerator
 %attr(755,root,root) %{_qtdir}/bin/assistant
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/qt4-assistant.qm
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/qt4-assistant.qm
-%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-assistant.qm
-%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/qt4-assistant.qm
+%attr(755,root,root) %{_qtdir}/bin/assistant_adp
+%lang(de) %{_datadir}/locale/de/LC_MESSAGES/qt4-assistant*.qm
+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/qt4-assistant*.qm
+%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-assistant*.qm
+%lang(zh_CN) %{_datadir}/locale/zh_*/LC_MESSAGES/qt4-assistant*.qm
 %{_desktopdir}/assistant-qt4.desktop
-%{_pixmapsdir}/assistant-qt4.png
+#%{_pixmapsdir}/assistant-qt4.png
 
 %files build
 %defattr(644,root,root,755)
@@ -1503,6 +1693,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/qt4-designer.qm
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-designer.qm
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/qt4-designer.qm
+%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/qt4-designer.qm
 %{_desktopdir}/designer-qt4.desktop
 %{_pixmapsdir}/designer-qt4.png
 
@@ -1516,13 +1707,22 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_qtdir}/bin/linguist
 %attr(755,root,root) %{_qtdir}/bin/lrelease
 %attr(755,root,root) %{_qtdir}/bin/lupdate
+%lang(de) %{_datadir}/locale/de/LC_MESSAGES/qt4-linguist.qm
 %lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/qt4-linguist.qm
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-linguist.qm
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/qt4-linguist.qm
+%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/qt4-linguist.qm
 %{_datadir}/qt4/phrasebooks
 %{_desktopdir}/linguist-qt4.desktop
 %{_pixmapsdir}/linguist-qt4.png
 
+%files phonon
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libphonon.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libphonon.so.4
+%dir %{_qtdir}/plugins/phonon_backend
+%attr(755,root,root) %{_qtdir}/plugins/phonon_backend/libphonon_gstreamer.so
+
 %files qmake
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qmake-qt4
@@ -1536,6 +1736,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_qtdir}/bin/qtconfig
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-qtconfig.qm
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/qt4-qtconfig.qm
+%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/qt4-qtconfig.qm
 %{_desktopdir}/qtconfig-qt4.desktop
 %{_pixmapsdir}/qtconfig-qt4.png
 
@@ -1545,6 +1746,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_qtdir}/bin/qvfb
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/qt4-qvfb.qm
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/qt4-qvfb.qm
+%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/qt4-qvfb.qm
 
 %files doc
 %defattr(644,root,root,755)
@@ -1581,9 +1783,21 @@ rm -rf $RPM_BUILD_ROOT
 %files -n QtTest-devel -f QtTest-devel.files
 %defattr(644,root,root,755)
 
+%files -n QtHelp-devel -f QtHelp-devel.files
+%defattr(644,root,root,755)
+
+%files -n QtWebKit-devel -f QtWebKit-devel.files
+%defattr(644,root,root,755)
+
+%files -n QtCLucene-devel -f QtCLucene-devel.files
+%defattr(644,root,root,755)
+
 %files -n QtXml-devel -f QtXml-devel.files
 %defattr(644,root,root,755)
 
+%files -n QtXmlPatterns-devel -f QtXmlPatterns-devel.files
+%defattr(644,root,root,755)
+
 %files -n Qt3Support-devel -f Qt3Support-devel.files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/uic3
@@ -1595,6 +1809,9 @@ rm -rf $RPM_BUILD_ROOT
 %files -n QtUiTools-devel -f QtUiTools-devel.files
 %defattr(644,root,root,755)
 
+%files phonon-devel -f phonon-devel.files
+%defattr(644,root,root,755)
+
 %if %{with static_libs}
 %files -n QtCore-static
 %defattr(644,root,root,755)
@@ -1628,17 +1845,37 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libQtSvg.a
 
+%files -n QtTest-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtTest.a
+
+#%files -n QtCLucene-static
+#%defattr(644,root,root,755)
+#%{_libdir}/libQtCLucene.a
+
+%files -n QtHelp-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtHelp.a
+
+%files -n QtWebKit-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtWebKit.a
+
 %files -n QtXml-static
 %defattr(644,root,root,755)
 %{_libdir}/libQtXml.a
 
+%files -n QtXmlPatterns-static
+%defattr(644,root,root,755)
+%{_libdir}/libQtXmlPatterns.a
+
 %files -n Qt3Support-static
 %defattr(644,root,root,755)
 %{_libdir}/libQt3Support.a
 
 %files -n QtAssistant-static
 %defattr(644,root,root,755)
-%{_libdir}/libQtAssistantClient.a
+#%{_libdir}/libQtAssistantClient.a
 
 %files -n QtDesigner-static
 %defattr(644,root,root,755)