- pl, partially cleaned up/unified with other qt5-*

diff --git a/qt5-qtquickcontrols.spec b/qt5-qtquickcontrols.spec
index 4ccdaa8f28e1df2ec7a0ea4c9882568110f866c5..5ac0d3b2444166c8ef5d5afd93dfcf30d0c6161a 100644 (file)
--- a/qt5-qtquickcontrols.spec
+++ b/qt5-qtquickcontrols.spec
@@ -2,7 +2,12 @@
 # - cleanup
 
 %define                orgname         qtquickcontrols
-Summary:       The Qt5 Quick Controls
+%define                qtbase_ver              %{version}
+%define                qtdeclarative_ver       %{version}
+%define                qtscript_ver            %{version}
+%define                qttools_ver             %{version}
+Summary:       The Qt5 Quick Controls modules
+Summary(pl.UTF-8):     Moduły Qt5 Quick Controls
 Name:          qt5-%{orgname}
 Version:       5.2.0
 Release:       0.1
@@ -11,51 +16,58 @@ Group:              X11/Libraries
 Source0:       http://download.qt-project.org/official_releases/qt/5.2/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
 # Source0-md5: 748ab947f59fb104db2ac1fefa073d81
 URL:           http://qt-project.org/
-BuildRequires: qt5-qtbase-devel = %{version}
-BuildRequires: qt5-qtdeclarative-devel = %{version}
-BuildRequires: qt5-qtscript-devel = %{version}
-BuildRequires: qt5-qttools-devel = %{version}
+BuildRequires: qt5-qtbase-devel >= %{qtbase_ver}
+BuildRequires: qt5-qtdeclarative-devel >= %{qtdeclarative_ver}
+BuildRequires: qt5-qtscript-devel >= %{qtscript_ver}
+BuildRequires: qt5-qttools-devel >= %{qttools_ver}
+%if %{with qch}
+BuildRequires: qt5-assistant >= %{qttools_ver}
+%endif
+BuildRequires: qt5-build >= %{qtbase_ver}
+BuildRequires: qt5-qmake >= %{qtbase_ver}
 BuildRequires: rpmbuild(macros) >= 1.654
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _noautoreqdep   libGL.so.1 libGLU.so.1
-%define                _noautostrip    '.*_debug\\.so*'
-
 %define                specflags       -fno-strict-aliasing
-%define                _qtdir          %{_libdir}/qt5
+%define                qt5dir          %{_libdir}/qt5
 
 %description
-Qt5 Quick Controls libraries.
-
-%package devel
-Summary:       The Qt5 Quick Controls - development files
-Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+Qt5 Quick Controls modules.
 
-%description devel
-Qt5 Quick Controls - development files.
+%description -l pl.UTF-8
+Moduły Qt5 Quick Controls.
 
 %package doc
-Summary:       The Qt5 Quick Controls - docs
+Summary:       Qt5 Quick Controls documentation in HTML format
+Summary(pl.UTF-8):     Dokumentacja do biblioteki Qt5 Quick Controls w formacie HTML
 Group:         Documentation
+Requires:      qt5-doc-common >= %{qtbase_ver}
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
 
 %description doc
-Qt5 Quick Controls - documentation.
+Qt5 Quick Controls documentation in HTML format.
 
-%package examples
-Summary:       Qt5 Quick Controls examples
-Group:         X11/Development/Libraries
+%description doc -l pl.UTF-8
+Dokumentacja do biblioteki Qt5 Quick Controls w formacie HTML.
+
+%package doc-qch
+Summary:       Qt5 Quick Controls documentation in QCH format
+Summary(pl.UTF-8):     Dokumentacja do biblioteki Qt5 Quick Controls w formacie QCH
+Group:         Documentation
+Requires:      qt5-doc-common >= %{qtbase_ver}
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
 
-%description examples
-Qt5 Quick Controls - examples.
+%description doc-qch
+Qt5 Quick Controls documentation in QCH format.
+
+%description doc-qch -l pl.UTF-8
+Dokumentacja do biblioteki Qt5 Quick Controls w formacie QCH.
 
 %prep
 %setup -q -n %{orgname}-opensource-src-%{version}
@@ -63,26 +75,29 @@ Qt5 Quick Controls - examples.
 %build
 qmake-qt5
 %{__make}
-%{__make} docs
+%{__make} %{!?with_qch:html_}docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        INSTALL_ROOT=$RPM_BUILD_ROOT
 
-%{__make} install_docs \
+%{__make} install_%{!?with_qch:html_}docs \
        INSTALL_ROOT=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post          -p /sbin/ldconfig
-%postun                -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
-%{_qtdir}/qml
+%{qt5dir}/qml/*
 
 %files doc
 %defattr(644,root,root,755)
-%{_docdir}/qt5-doc
+%{_docdir}/qt5-doc/qtquickcontrols
+
+%if %{with qch}
+%files doc-qch
+%defattr(644,root,root,755)
+%{_docdir}/qt5-doc/qtquickcontrols.qch
+%endif