- added translations

- package Qt5Designer plugins that depend on Quick and WebKit

diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index e0cc8f71bf2c30abcec96d878cec1eabaac9a5cf..2b2d62fa2a5421b72b839ce307c3c63f5a04830f 100644 (file)
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -1,9 +1,14 @@
 #
 # Conditional build:
-%bcond_without qch     # QCH documentation
+%bcond_without qch             # QCH documentation
+%bcond_without qm              # QM translations
+%bcond_without qtdeclarative   # Quick2 plugin for Qt5Declarative
+%bcond_without qtwebkit        # WebKit plugin for Qt5Declarative
 
 %define                orgname         qttools
-%define                qtbase_ver      %{version}
+%define                qtbase_ver              %{version}
+%define                qtdeclarative_ver       %{version}
+%define                qtwebkit_ver            %{version}
 Summary:       Development tools for Qt 5
 Summary(pl.UTF-8):     Narzędzia programistyczne dla Qt 5
 Name:          qt5-%{orgname}
@@ -13,18 +18,23 @@ License:    LGPL v2.1 with Digia Qt LGPL Exception v1.1 or GPL v3.0
 Group:         X11/Libraries
 Source0:       http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
 # Source0-md5: 628a91ddfe34efc6622fdba8c6348855
+Source1:       http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/qttranslations-opensource-src-%{version}.tar.xz
+# Source1-md5: 1f8d488b6ac26cdbec7f7f7364cd01d0
 URL:           http://qt-project.org/
 BuildRequires: OpenGL-devel
 BuildRequires: Qt5Core-devel >= %{qtbase_ver}
 BuildRequires: Qt5Gui-devel >= %{qtbase_ver}
 BuildRequires: Qt5Network-devel >= %{qtbase_ver}
 BuildRequires: Qt5PrintSupport-devel >= %{qtbase_ver}
+%{?with_qtdeclarative:BuildRequires:   Qt5Quick-devel >= %{qtdeclarative_ver}}
 BuildRequires: Qt5Sql-devel >= %{qtbase_ver}
+%{?with_qtwebkit:BuildRequires:        Qt5WebKit-devel >= %{qtwebkit_ver}}
 BuildRequires: Qt5Widgets-devel >= %{qtbase_ver}
 BuildRequires: Qt5Xml-devel >= %{qtbase_ver}
 %{?with_qch:BuildRequires:     qt5-assistant >= 5.2}
 BuildRequires: qt5-build >= %{qtbase_ver}
 BuildRequires: qt5-doc-common >= %{qtbase_ver}
+%{?with_qm:BuildRequires:      qt5-linguist >= 5.2}
 BuildRequires: qt5-qmake >= %{qtbase_ver}
 BuildRequires: rpmbuild(macros) >= 1.654
 BuildRequires: tar >= 1:1.22
@@ -200,6 +210,32 @@ Header files for Qt5 Designer libraries.
 %description -n Qt5Designer-devel -l pl.UTF-8
 Pliki nagłówkowe bibliotek Qt5 Designer.
 
+%package -n Qt5Designer-plugin-qquickwidget
+Summary:       QQuickWidget (Quick2) plugin for Qt5 Designer
+Summary(pl.UTF-8):     Wtyczka QQuickWidget (Quick2) dla Qt5 Designera
+Group:         X11/Libraries
+Requires:      Qt5Designer = %{version}-%{release}
+Requires:      Qt5Quick >= %{qtdeclarative_ver}
+
+%description -n Qt5Designer-plugin-qquickwidget
+QQuickWidget (Quick2) plugin for Qt5 Designer.
+
+%description -n Qt5Designer-plugin-qquickwidget -l pl.UTF-8
+Wtyczka QQuickWidget (Quick2) dla Qt5 Designera.
+
+%package -n Qt5Designer-plugin-qwebview
+Summary:       QWebView plugin for Qt5 Designer
+Summary(pl.UTF-8):     Wtyczka QWebView dla Qt5 Designera
+Group:         X11/Libraries
+Requires:      Qt5Designer = %{version}-%{release}
+Requires:      Qt5WebKit >= %{qtwebkit_ver}
+
+%description -n Qt5Designer-plugin-qwebview
+QWebView plugin for Qt5 Designer.
+
+%description -n Qt5Designer-plugin-qwebview -l pl.UTF-8
+Wtyczka QWebView dla Qt5 Designera.
+
 %package -n Qt5Help
 Summary:       Qt5 Help library
 Summary(pl.UTF-8):     Biblioteka Qt5 Help
@@ -305,7 +341,7 @@ Qt5 Tools - examples.
 Przykłady do narzędzi Qt5.
 
 %prep
-%setup -q -n %{orgname}-opensource-src-%{version}
+%setup -q -n %{orgname}-opensource-src-%{version} %{?with_qm:-a1}
 
 %build
 qmake-qt5
@@ -314,6 +350,13 @@ qmake-qt5
 # build only HTML docs if without qch (which needs already installed qhelpgenerator)
 %{__make} %{!?with_qch:html_}docs
 
+%if %{with qm}
+cd qttranslations-opensource-src-%{version}
+qmake-qt5
+%{__make}
+cd ..
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
@@ -324,6 +367,16 @@ install -d $RPM_BUILD_ROOT%{_bindir}
 %{__make} install_%{!?with_qch:html_}docs \
        INSTALL_ROOT=$RPM_BUILD_ROOT
 
+%if %{with qm}
+%{__make} -C qttranslations-opensource-src-%{version} install \
+       INSTALL_ROOT=$RPM_BUILD_ROOT
+# keep only assistant, designer, linguist, qt_help, qtconfig here
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/qt5/translations/{qmlviewer,qtbase,qtconnectivity,qtdeclarative,qtlocation,qtmultimedia,qtquick1,qtscript,qtxmlpatterns}_*.qm
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/qt5/translations/qt_{??,??_??}.qm
+# qtconfig build is currently disabled (see src/src.pro)
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/qt5/translations/qtconfig_*.qm
+%endif
+
 # kill unnecessary -L%{_libdir} from *.la, *.prl, *.pc
 %{__sed} -i -e "s,-L%{_libdir} \?,,g" \
        $RPM_BUILD_ROOT%{_libdir}/*.{la,prl} \
@@ -381,6 +434,26 @@ ifecho_tree examples %{_examplesdir}/qt5/help
 ifecho_tree examples %{_examplesdir}/qt5/linguist
 ifecho_tree examples %{_examplesdir}/qt5/uitools
 
+# find_lang --with-qm supports only PLD qt3/qt4 specific %{_datadir}/locale/*/LC_MESSAGES layout
+find_qt5_qm()
+{
+       name="$1"
+       find $RPM_BUILD_ROOT%{_datadir}/qt5/translations -name "${name}_*.qm" | \
+               sed -e "s:^$RPM_BUILD_ROOT::" \
+                   -e 's:\(.*/'$name'_\)\([a-z][a-z][a-z]\?\)\(_[A-Z][A-Z]\)\?\(\.qm\)$:%lang(\2\3) \1\2\3\4:'
+}
+
+echo '%defattr(644,root,root,755)' > assistant.lang
+echo '%defattr(644,root,root,755)' > designer.lang
+echo '%defattr(644,root,root,755)' > linguist.lang
+echo '%defattr(644,root,root,755)' > qt_help.lang
+%if %{with qm}
+find_qt5_qm assistant >> assistant.lang
+find_qt5_qm designer >> designer.lang
+find_qt5_qm linguist >> linguist.lang
+find_qt5_qm qt_help >> qt_help.lang
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -403,7 +476,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{qt5dir}/bin/qtdiag
 %attr(755,root,root) %{qt5dir}/bin/qtpaths
 
-%files -n qt5-assistant
+%files -n qt5-assistant -f assistant.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/assistant-qt5
 %attr(755,root,root) %{_bindir}/qcollectiongenerator-qt5
@@ -414,12 +487,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{qt5dir}/bin/qhelpconverter
 %attr(755,root,root) %{qt5dir}/bin/qhelpgenerator
 
-%files -n qt5-designer
+%files -n qt5-designer -f designer.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/designer-qt5
 %attr(755,root,root) %{qt5dir}/bin/designer
 
-%files -n qt5-linguist
+%files -n qt5-linguist -f linguist.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/lconvert-qt5
 %attr(755,root,root) %{_bindir}/linguist-qt5
@@ -429,7 +502,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{qt5dir}/bin/linguist
 %attr(755,root,root) %{qt5dir}/bin/lrelease
 %attr(755,root,root) %{qt5dir}/bin/lupdate
-%dir %{_datadir}/qt5
 %{_datadir}/qt5/phrasebooks
 %{_libdir}/cmake/Qt5LinguistTools
 
@@ -489,7 +561,21 @@ rm -rf $RPM_BUILD_ROOT
 %{qt5dir}/mkspecs/modules/qt_lib_designer_private.pri
 %{qt5dir}/mkspecs/modules/qt_lib_designercomponents_private.pri
 
-%files -n Qt5Help
+%if %{with qtdeclarative}
+%files -n Qt5Designer-plugin-qquickwidget
+%defattr(644,root,root,755)
+%attr(755,root,root) %{qt5dir}/plugins/designer/libqquickwidget.so
+%{_libdir}/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake
+%endif
+
+%if %{with qtwebkit}
+%files -n Qt5Designer-plugin-qwebview
+%defattr(644,root,root,755)
+%attr(755,root,root) %{qt5dir}/plugins/designer/libqwebview.so
+%{_libdir}/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
+%endif
+
+%files -n Qt5Help -f qt_help.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt5Help.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQt5Help.so.5