X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=qt5-qtquickcontrols.spec;h=65911f6d6b932de45eee253392d15a8e0a472e15;hb=HEAD;hp=0b6bf433fff03a348e09d9e77d782b0d6386a966;hpb=18fe00738c16cafcef610e96673af6df58f9deed;p=packages%2Fqt5-qtquickcontrols.git

diff --git a/qt5-qtquickcontrols.spec b/qt5-qtquickcontrols.spec
index 0b6bf43..7ccca86 100644
--- a/qt5-qtquickcontrols.spec
+++ b/qt5-qtquickcontrols.spec
@@ -5,23 +5,22 @@
 
 %define		orgname		qtquickcontrols
 %define		qtbase_ver		%{version}
-%define		qtdeclarative_ver	%{version}
+%define		qtdeclarative_ver	5.12.3-2
 %define		qttools_ver		%{version}
 Summary:	The Qt5 Quick Controls modules
 Summary(pl.UTF-8):	Moduły Qt5 Quick Controls
 Name:		qt5-%{orgname}
-Version:	5.8.0
+Version:	5.15.14
 Release:	1
-License:	LGPL v3 or GPL v2 or commercial
+License:	LGPL v3 or GPL v2 or GPL v3 or commercial
 Group:		X11/Libraries
-Source0:	http://download.qt.io/official_releases/qt/5.8/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
-# Source0-md5:	62124ab5b9a9aee99138d848ea0e35a3
-Source1:	http://download.qt.io/official_releases/qt/5.8/%{version}/submodules/qttranslations-opensource-src-%{version}.tar.xz
-# Source1-md5:	b6c6748a923b9639c7d018cfdb04caf4
-URL:		http://www.qt.io/
+Source0:	https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-opensource-src-%{version}.tar.xz
+# Source0-md5:	b2c02a03ab941d8185e10e7615fc9e14
+Source1:	https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/qttranslations-everywhere-opensource-src-%{version}.tar.xz
+# Source1-md5:	6f4f2fdf3466f8bc97a074258f124c13
+URL:		https://www.qt.io/
 BuildRequires:	Qt5Core-devel >= %{qtbase_ver}
 BuildRequires:	Qt5Gui-devel >= %{qtbase_ver}
-BuildRequires:	Qt5Network-devel >= %{qtbase_ver}
 BuildRequires:	Qt5Qml-devel >= %{qtdeclarative_ver}
 BuildRequires:	Qt5Quick-devel >= %{qtdeclarative_ver}
 BuildRequires:	Qt5Widgets-devel >= %{qtbase_ver}
@@ -31,7 +30,8 @@ BuildRequires:	qt5-assistant >= %{qttools_ver}
 BuildRequires:	qt5-build >= %{qtbase_ver}
 %{?with_qm:BuildRequires:	qt5-linguist >= %{qttools_ver}}
 BuildRequires:	qt5-qmake >= %{qtbase_ver}
-BuildRequires:	rpmbuild(macros) >= 1.654
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 2.016
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,12 +58,12 @@ Ten pakiet zawiera moduły Qt5 Quick Controls, Dialogs.
 Summary:	The Qt5 Quick Controls modules
 Summary(pl.UTF-8):	Moduły Qt5 Quick Controls
 Group:		X11/Libraries
-Requires:	Qt5Core >= %{qtbase_ver}
+%requires_eq_to	Qt5Core Qt5Core-devel
 Requires:	Qt5Gui >= %{qtbase_ver}
 Requires:	Qt5Qml >= %{qtdeclarative_ver}
 Requires:	Qt5Quick >= %{qtdeclarative_ver}
 Requires:	Qt5Widgets >= %{qtbase_ver}
-Obsoletes:	qt5-qtquickcontrols
+Obsoletes:	qt5-qtquickcontrols < 5.3.0
 
 %description -n Qt5Quick-controls
 Qt5 Quick Controls, Dialogs modules.
@@ -83,9 +83,7 @@ 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 in HTML format.
@@ -98,9 +96,7 @@ 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 doc-qch
 Qt5 Quick Controls documentation in QCH format.
@@ -108,23 +104,36 @@ Qt5 Quick Controls documentation in QCH format.
 %description doc-qch -l pl.UTF-8
 Dokumentacja do biblioteki Qt5 Quick Controls w formacie QCH.
 
+%package examples
+Summary:	Qt5 Quick Controls examples
+Summary(pl.UTF-8):	Przykłady do bibliotek Qt5 Quick Controls
+Group:		X11/Development/Libraries
+BuildArch:	noarch
+
+%description examples
+Qt5 Quick Controls examples.
+
+%description examples -l pl.UTF-8
+Przykłady do bibliotek Qt5 Quick Controls.
+
 %prep
-%setup -q -n %{orgname}-opensource-src-%{version} %{?with_qm:-a1}
+%setup -q -n %{orgname}-everywhere-src-%{version} %{?with_qm:-a1}
 
 %build
-qmake-qt5
+%{qmake_qt5}
 %{__make}
 %{?with_doc:%{__make} docs}
 
 %if %{with qm}
-cd qttranslations-opensource-src-%{version}
-qmake-qt5
+cd qttranslations-everywhere-src-%{version}
+%{qmake_qt5}
 %{__make}
 cd ..
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
@@ -134,12 +143,37 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if %{with qm}
-%{__make} -C qttranslations-opensource-src-%{version} install \
+%{__make} -C qttranslations-everywhere-src-%{version} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 # keep only qtquickcontrols
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/qt5/translations/{assistant,designer,linguist,qmlviewer,qt,qtbase,qtconfig,qtconnectivity,qtdeclarative,qtlocation,qtmultimedia,qtquick1,qtscript,qtwebsockets,qtxmlpatterns}_*.qm
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/qt5/translations/{assistant,designer,linguist,qt,qtbase,qtconnectivity,qtdeclarative,qtlocation,qtmultimedia,qtquickcontrols2,qtserialport,qtscript,qtwebengine,qtwebsockets,qtxmlpatterns}_*.qm
 %endif
 
+# Prepare some files list
+ifecho() {
+	r="$RPM_BUILD_ROOT$2"
+	if [ -d "$r" ]; then
+		echo "%%dir $2" >> $1.files
+	elif [ -x "$r" ] ; then
+		echo "%%attr(755,root,root) $2" >> $1.files
+	elif [ -f "$r" ]; then
+		echo "$2" >> $1.files
+	else
+		echo "Error generation $1 files list!"
+		echo "$r: no such file or directory!"
+		return 1
+	fi
+}
+ifecho_tree() {
+	ifecho $1 $2
+	for f in `find $RPM_BUILD_ROOT$2 -printf "%%P "`; do
+		ifecho $1 $2/$f
+	done
+}
+
+echo "%defattr(644,root,root,755)" > examples.files
+ifecho_tree examples %{_examplesdir}/qt5/quickcontrols
+
 # find_lang --with-qm supports only PLD qt3/qt4 specific %{_datadir}/locale/*/LC_MESSAGES layout
 find_qt5_qm()
 {
@@ -163,22 +197,33 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{qt5dir}/qml/QtQuick/Controls
 %{qt5dir}/qml/QtQuick/Controls/Private
 %{qt5dir}/qml/QtQuick/Controls/Styles
+# R: Core Gui Qml Quick Widgets
 %attr(755,root,root) %{qt5dir}/qml/QtQuick/Controls/libqtquickcontrolsplugin.so
 %{qt5dir}/qml/QtQuick/Controls/*.qml
+%{qt5dir}/qml/QtQuick/Controls/*.qmlc
 %{qt5dir}/qml/QtQuick/Controls/plugins.qmltypes
 %{qt5dir}/qml/QtQuick/Controls/qmldir
 %dir %{qt5dir}/qml/QtQuick/Dialogs
 %{qt5dir}/qml/QtQuick/Dialogs/Private
+# R: Core Gui Qml Quick
 %attr(755,root,root) %{qt5dir}/qml/QtQuick/Dialogs/libdialogplugin.so
+%{qt5dir}/qml/QtQuick/Dialogs/*.qml
+%{qt5dir}/qml/QtQuick/Dialogs/*.qmlc
+%{qt5dir}/qml/QtQuick/Dialogs/images
 %{qt5dir}/qml/QtQuick/Dialogs/plugins.qmltypes
+%{qt5dir}/qml/QtQuick/Dialogs/qml
 %{qt5dir}/qml/QtQuick/Dialogs/qmldir
 %dir %{qt5dir}/qml/QtQuick/Extras
 %{qt5dir}/qml/QtQuick/Extras/designer
+# R: Core Gui Qml Quick
 %attr(755,root,root) %{qt5dir}/qml/QtQuick/Extras/libqtquickextrasplugin.so
+%{qt5dir}/qml/QtQuick/Extras/*.qml
+%{qt5dir}/qml/QtQuick/Extras/*.qmlc
 %{qt5dir}/qml/QtQuick/Extras/plugins.qmltypes
 %{qt5dir}/qml/QtQuick/Extras/qmldir
 %{qt5dir}/qml/QtQuick/Extras/Private
 %dir %{qt5dir}/qml/QtQuick/PrivateWidgets
+# R: Core Gui Qml Quick Widgets
 %attr(755,root,root) %{qt5dir}/qml/QtQuick/PrivateWidgets/libwidgetsplugin.so
 %{qt5dir}/qml/QtQuick/PrivateWidgets/plugins.qmltypes
 %{qt5dir}/qml/QtQuick/PrivateWidgets/qmldir
@@ -186,13 +231,18 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with doc}
 %files doc
 %defattr(644,root,root,755)
-%{_docdir}/qt5-doc/qtquickcontrols
+%{_docdir}/qt5-doc/qtquickcontrols1
 %{_docdir}/qt5-doc/qtquickdialogs
 %{_docdir}/qt5-doc/qtquickextras
 
 %files doc-qch
 %defattr(644,root,root,755)
-%{_docdir}/qt5-doc/qtquickcontrols.qch
+%{_docdir}/qt5-doc/qtquickcontrols1.qch
 %{_docdir}/qt5-doc/qtquickdialogs.qch
 %{_docdir}/qt5-doc/qtquickextras.qch
 %endif
+
+%files examples -f examples.files
+%defattr(644,root,root,755)
+# XXX: dir shared with qt5-qtbase-examples
+%dir %{_examplesdir}/qt5