[packages/qt5-qtdeclarative] - updated to 5.2.1 - adjusted dependencies, build and files

qboosh qboosh at pld-linux.org
Wed Apr 2 18:44:11 CEST 2014 

commit 395735eda9076acbe45f57ce346b4f8cfc6a5f25
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Apr 2 18:45:41 2014 +0200

    - updated to 5.2.1
    - adjusted dependencies, build and files

 qt5-qtdeclarative.spec | 184 ++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 152 insertions(+), 32 deletions(-)
---
diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index e106423..79763ed 100644
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -1,19 +1,33 @@
-# TODO:
-# - cleanup
+# TODO: QtQml / QtQuick split?
+
+# Conditional build:
+%bcond_without	qch	# documentation in QCH format
 
 %define		orgname		qtdeclarative
+%define		qtbase_ver	%{version}
+%define		qttools_ver	%{version}
 Summary:	The Qt5 Declarative libraries
 Summary(pl.UTF-8):	Biblioteki Qt5 Declarative
 Name:		qt5-%{orgname}
-Version:	5.2.0
+Version:	5.2.1
 Release:	0.1
 License:	LGPL v2.1 or GPL v3.0
 Group:		X11/Libraries
 Source0:	http://download.qt-project.org/official_releases/qt/5.2/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
-# Source0-md5:	0f7714c5c91b8eb7cdc1071f0a51c202
+# Source0-md5:	a23fba03a4b48f36fe8b51d326d08acc
 URL:		http://qt-project.org/
-BuildRequires:	qt5-qtbase-devel = %{version}
-BuildRequires:	qt5-qttools-devel = %{version}
+BuildRequires:	OpenGL-devel
+BuildRequires:	Qt5Core-devel >= %{qtbase_ver}
+BuildRequires:	Qt5Gui-devel >= %{qtbase_ver}
+BuildRequires:	Qt5Network-devel >= %{qtbase_ver}
+BuildRequires:	Qt5Sql-devel >= %{qtbase_ver}
+BuildRequires:	Qt5Test-devel >= %{qtbase_ver}
+BuildRequires:	Qt5Widgets-devel >= %{qtbase_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
@@ -84,25 +98,36 @@ Przykłady do biblioteki Qt5 Declarative.
 %build
 qmake-qt5
 %{__make}
-%{__make} docs
+%{__make} %{!?with_qch:html_}docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_bindir}
+
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
-%{__make} install_docs \
+%{__make} install_%{!?with_qch:html_}docs \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
+# kill unnecessary -L%{_libdir} from *.la, *.prl, *.pc
+%{__sed} -i -e "s,-L%{_libdir} \?,,g" \
+	$RPM_BUILD_ROOT%{_libdir}/*.{la,prl} \
+	$RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
+
+# useless symlinks
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libQt5*.so.5.?
 # actually drop *.la, follow policy of not packaging them when *.pc exist
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libQt5*.la
 
+# symlinks in system bin dir
+for f in qml qmlbundle qmlimportscanner qmlmin qmlplugindump qmlprofiler qmlscene qmltestrunner ; do
+	ln -sf ../%{_lib}/qt5/bin/$f $RPM_BUILD_ROOT%{_bindir}/${f}-qt5
+done
+
 # Prepare some files list
 ifecho() {
-	RESULT=`echo $RPM_BUILD_ROOT$2 2>/dev/null`
-	[ "$RESULT" == "" ] && return # XXX this is never true due $RPM_BUILD_ROOT being set
-	r=`echo $RESULT | awk '{ print $1 }'`
-
+	r="$RPM_BUILD_ROOT$2"
 	if [ -d "$r" ]; then
 		echo "%%dir $2" >> $1.files
 	elif [ -x "$r" ] ; then
@@ -115,12 +140,17 @@ ifecho() {
 		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 examples %{_examplesdir}/qt5
-for f in `find $RPM_BUILD_ROOT%{_examplesdir}/qt5 -printf "%%P "`; do
-	ifecho examples %{_examplesdir}/qt5/$f
-done
+ifecho_tree examples %{_examplesdir}/qt5/qml
+ifecho_tree examples %{_examplesdir}/qt5/qmltest
+ifecho_tree examples %{_examplesdir}/qt5/quick
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -131,18 +161,84 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 #%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %ghost %{_libdir}/libQt5Qml.so.?
-%attr(755,root,root) %{_libdir}/libQt5Qml.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libQt5Quick.so.?
-%attr(755,root,root) %{_libdir}/libQt5Quick.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libQt5QuickParticles.so.?
-%attr(755,root,root) %{_libdir}/libQt5QuickParticles.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libQt5QuickTest.so.?
-%attr(755,root,root) %{_libdir}/libQt5QuickTest.so.*.*
-%{_libdir}/libQt5QmlDevTools.a
-%attr(755,root,root) %{qt5dir}/bin/qml*
-%attr(755,root,root) %{qt5dir}/plugins
-%attr(755,root,root) %{qt5dir}/qml
+%attr(755,root,root) %{_bindir}/qml-qt5
+%attr(755,root,root) %{_bindir}/qmlbundle-qt5
+%attr(755,root,root) %{_bindir}/qmlimportscanner-qt5
+%attr(755,root,root) %{_bindir}/qmlmin-qt5
+%attr(755,root,root) %{_bindir}/qmlplugindump-qt5
+%attr(755,root,root) %{_bindir}/qmlprofiler-qt5
+%attr(755,root,root) %{_bindir}/qmlscene-qt5
+%attr(755,root,root) %{_bindir}/qmltestrunner-qt5
+%attr(755,root,root) %{_libdir}/libQt5Qml.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQt5Qml.so.5
+%attr(755,root,root) %{_libdir}/libQt5Quick.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQt5Quick.so.5
+%attr(755,root,root) %{_libdir}/libQt5QuickParticles.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQt5QuickParticles.so.5
+%attr(755,root,root) %{_libdir}/libQt5QuickTest.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQt5QuickTest.so.5
+%attr(755,root,root) %{qt5dir}/bin/qml
+%attr(755,root,root) %{qt5dir}/bin/qmlbundle
+%attr(755,root,root) %{qt5dir}/bin/qmlimportscanner
+%attr(755,root,root) %{qt5dir}/bin/qmlmin
+%attr(755,root,root) %{qt5dir}/bin/qmlplugindump
+%attr(755,root,root) %{qt5dir}/bin/qmlprofiler
+%attr(755,root,root) %{qt5dir}/bin/qmlscene
+%attr(755,root,root) %{qt5dir}/bin/qmltestrunner
+%dir %{qt5dir}/plugins/accessible
+%attr(755,root,root) %{qt5dir}/plugins/accessible/libqtaccessiblequick.so
+%dir %{qt5dir}/plugins/qmltooling
+%attr(755,root,root) %{qt5dir}/plugins/qmltooling/libqmldbg_qtquick2.so
+%attr(755,root,root) %{qt5dir}/plugins/qmltooling/libqmldbg_tcp.so
+%dir %{qt5dir}/qml
+%dir %{qt5dir}/qml/Qt
+%dir %{qt5dir}/qml/Qt/labs
+%dir %{qt5dir}/qml/Qt/labs/folderlistmodel
+%attr(755,root,root) %{qt5dir}/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
+%{qt5dir}/qml/Qt/labs/folderlistmodel/plugins.qmltypes
+%{qt5dir}/qml/Qt/labs/folderlistmodel/qmldir
+%dir %{qt5dir}/qml/Qt/labs/settings
+%attr(755,root,root) %{qt5dir}/qml/Qt/labs/settings/libqmlsettingsplugin.so
+%{qt5dir}/qml/Qt/labs/settings/plugins.qmltypes
+%{qt5dir}/qml/Qt/labs/settings/qmldir
+%dir %{qt5dir}/qml/QtQml
+%dir %{qt5dir}/qml/QtQml/Models.2
+%attr(755,root,root) %{qt5dir}/qml/QtQml/Models.2/libmodelsplugin.so
+%{qt5dir}/qml/QtQml/Models.2/qmldir
+%dir %{qt5dir}/qml/QtQuick
+%dir %{qt5dir}/qml/QtQuick/Dialogs
+%attr(755,root,root) %{qt5dir}/qml/QtQuick/Dialogs/libdialogplugin.so
+%{qt5dir}/qml/QtQuick/Dialogs/plugins.qmltypes
+%{qt5dir}/qml/QtQuick/Dialogs/qmldir
+%dir %{qt5dir}/qml/QtQuick/Dialogs/Private
+%attr(755,root,root) %{qt5dir}/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so
+%{qt5dir}/qml/QtQuick/Dialogs/Private/qmldir
+%dir %{qt5dir}/qml/QtQuick/LocalStorage
+%attr(755,root,root) %{qt5dir}/qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so
+%{qt5dir}/qml/QtQuick/LocalStorage/plugins.qmltypes
+%{qt5dir}/qml/QtQuick/LocalStorage/qmldir
+%dir %{qt5dir}/qml/QtQuick/Particles.2
+%attr(755,root,root) %{qt5dir}/qml/QtQuick/Particles.2/libparticlesplugin.so
+%{qt5dir}/qml/QtQuick/Particles.2/plugins.qmltypes
+%{qt5dir}/qml/QtQuick/Particles.2/qmldir
+%dir %{qt5dir}/qml/QtQuick/PrivateWidgets
+%attr(755,root,root) %{qt5dir}/qml/QtQuick/PrivateWidgets/libwidgetsplugin.so
+%{qt5dir}/qml/QtQuick/PrivateWidgets/plugins.qmltypes
+%{qt5dir}/qml/QtQuick/PrivateWidgets/qmldir
+%dir %{qt5dir}/qml/QtQuick/Window.2
+%attr(755,root,root) %{qt5dir}/qml/QtQuick/Window.2/libwindowplugin.so
+%{qt5dir}/qml/QtQuick/Window.2/plugins.qmltypes
+%{qt5dir}/qml/QtQuick/Window.2/qmldir
+%dir %{qt5dir}/qml/QtQuick.2
+%attr(755,root,root) %{qt5dir}/qml/QtQuick.2/libqtquick2plugin.so
+%{qt5dir}/qml/QtQuick.2/plugins.qmltypes
+%{qt5dir}/qml/QtQuick.2/qmldir
+%dir %{qt5dir}/qml/QtTest
+%attr(755,root,root) %{qt5dir}/qml/QtTest/libqmltestplugin.so
+%{qt5dir}/qml/QtTest/plugins.qmltypes
+%{qt5dir}/qml/QtTest/qmldir
+%{qt5dir}/qml/QtTest/testlogger.js
+%{qt5dir}/qml/QtTest/*.qml
 
 %files devel
 %defattr(644,root,root,755)
@@ -150,6 +246,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libQt5Quick.so
 %attr(755,root,root) %{_libdir}/libQt5QuickParticles.so
 %attr(755,root,root) %{_libdir}/libQt5QuickTest.so
+%{_libdir}/libQt5QmlDevTools.a
 
 %{_libdir}/libQt5Qml.prl
 %{_libdir}/libQt5Quick.prl
@@ -160,18 +257,41 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/Qt5Qml
 %{_libdir}/cmake/Qt5Quick
 %{_libdir}/cmake/Qt5QuickTest
+%{_libdir}/cmake/Qt5Widgets/Qt5Widgets_AccessibleQuickFactory.cmake
 
 %{_includedir}/qt5/QtQml
 %{_includedir}/qt5/QtQuick
 %{_includedir}/qt5/QtQuickParticles
 %{_includedir}/qt5/QtQuickTest
 
-%{_pkgconfigdir}/*.pc
-
-%{qt5dir}/mkspecs
+%{_pkgconfigdir}/Qt5Qml.pc
+%{_pkgconfigdir}/Qt5QmlDevTools.pc
+%{_pkgconfigdir}/Qt5Quick.pc
+%{_pkgconfigdir}/Qt5QuickParticles.pc
+%{_pkgconfigdir}/Qt5QuickTest.pc
+
+%{qt5dir}/mkspecs/modules/qt_lib_qml.pri
+%{qt5dir}/mkspecs/modules/qt_lib_qml_private.pri
+%{qt5dir}/mkspecs/modules/qt_lib_qmldevtools_private.pri
+%{qt5dir}/mkspecs/modules/qt_lib_qmltest.pri
+%{qt5dir}/mkspecs/modules/qt_lib_qmltest_private.pri
+%{qt5dir}/mkspecs/modules/qt_lib_quick.pri
+%{qt5dir}/mkspecs/modules/qt_lib_quick_private.pri
+%{qt5dir}/mkspecs/modules/qt_lib_quickparticles_private.pri
 
 %files doc
 %defattr(644,root,root,755)
-%{_docdir}/qt5-doc
+%{_docdir}/qt5-doc/qtqml
+%{_docdir}/qt5-doc/qtquick
+%{_docdir}/qt5-doc/qtquickdialogs
+
+%if %{with qch}
+#%files doc-qch
+%{_docdir}/qt5-doc/qtqml.qch
+%{_docdir}/qt5-doc/qtquick.qch
+%{_docdir}/qt5-doc/qtquickdialogs.qch
+%endif
 
 %files examples -f examples.files
+# XXX: dir shared with qt5-qtbase-examples
+%dir %{_examplesdir}/qt5
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtdeclarative.git/commitdiff/395735eda9076acbe45f57ce346b4f8cfc6a5f25

More information about the pld-cvs-commit mailing list