+# The MIT License (MIT)
+#
+# Copyright (c) 2013 Tomasz Olszak <olszak.tomasz@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# This file is based on qtdeclarative.spec from Mer project
+# http://merproject.org
+
Name: qt5-qtdeclarative
Summary: Qt Declarative library
-Version: 5.0.2
-Release: 1%{?dist}
-Group: Qt/Qt
-License: LGPLv2.1 with exception or GPLv3
-URL: http://qt.nokia.com
+Version: 5.2.0
+Release: 0%{?dist}
+Group: Base/Libraries
+License: LGPL-2.1+ or GPL-3.0
+URL: http://qt.digia.com
Source0: %{name}-%{version}.tar.bz2
BuildRequires: qt5-qtcore-devel
BuildRequires: qt5-qtgui-devel
BuildRequires: qt5-qtopengl-devel
BuildRequires: qt5-qtsql-devel
BuildRequires: qt5-qttest-devel
-BuildRequires: qt5-qtv8-devel
BuildRequires: qt5-qtwidgets-devel
BuildRequires: qt5-qtxmlpatterns-devel
BuildRequires: qt5-qmake
%package devel
Summary: Qt Declarative - development files
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt5-qtsql-devel
Requires: qt5-qtnetwork-devel
%package qtquicktest
Summary: Qt Declarative QtQuickTest library
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%package qtquicktest-devel
Summary: Qt Declarative QtQuickTest - development files
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-devel = %{version}-%{release}
Requires: qt5-qtdeclarative-qtquicktest = %{version}-%{release}
%package qtquick
Summary: Qt Declarative - QtQuick library
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description qtquick
%package qtquick-devel
Summary: Qt Declarative - QtQuick development files
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt5-qtdeclarative-qtquick = %{version}-%{release}
%package qtquickparticles
Summary: Qt Declarative - QtQuick Particles library
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description qtquickparticles
%package qtquickparticles-devel
Summary: Qt Declarative - QtQuick Particles development files
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt5-qtdeclarative-qtquickparticles = %{version}-%{release}
%package qtdeclarativetools-devel
Summary: Qt Declarative QtQmlDevTools - development files
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-devel = %{version}-%{release}
Requires: qt5-qtdeclarative-devel = %{version}-%{release}
%package import-folderlistmodel
Summary: Qt Declarative folderlistmodel plugin
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description import-folderlistmodel
This package provides the QtQml folderlistmodel plugin
+%package import-settings
+Summary: Qt Declarative settings plugin
+Group: Base/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description import-settings
+This package provides the QtQml settings plugin
+
%package import-localstorageplugin
Summary: Qt LocalStorage plugin
Requires: %{name} = %{version}-%{release}
%description import-localstorageplugin
This package provided the Qt LocalStorage plugin
-#%package import-inputcontext
-#Summary: Qt Declarative input context plugin
-#Group: Qt/Qt
-#Requires: %{name} = %{version}-%{release}
-#
-#%description import-inputcontext
-#This package provides the QtDeclarative input context plugin
-
-#%package import-particles
-#Summary: Qt Declarative particles plugin
-#Group: Qt/Qt
-#Requires: %{name} = %{version}-%{release}
-#
-#%description import-particles
-#This package provides the QtDeclarative particles plugin
-
%package plugin-qmlinspector
Summary: Qt Declarative QML inspector plugin
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description plugin-qmlinspector
%package plugin-accessible
Summary: Qt Declarative accessible plugin
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description plugin-accessible
%package import-qtquick2plugin
Summary: Qt Declarative QtQuick 2 support plugin
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description import-qtquick2plugin
%package import-qttest
Summary: Qt Declarative QtTest plugin
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description import-qttest
%package import-particles2
Summary: Qt Declarative Particles plugin
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description import-particles2
%package import-window2
Summary: Qt Declarative Window plugin
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description import-window2
%package import-models2
Summary: Qt Declarative models plugin
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description import-models2
%package import-dialogs
Summary: Qt Declarative dialogs plugin
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description import-dialogs
%package import-privatewidgets
Summary: Qt Declarative private widgets plugin
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description import-privatewidgets
%package import-xmllistmodel
Summary: Qt Declarative XmlListModel plugin
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description import-xmllistmodel
%package qmlscene
Summary: QML scene viewer
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description qmlscene
This package contains the QML viewer for QtQuick 2.0 files.
+%package qml
+Summary: QML viewer
+Group: Base/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description qml
+This package contains recommended the QML viewer for QtQuick 2.0 files. It supersedes the qmlscene.
+
%package devel-tools
Summary: QML development tools
-Group: Qt/Qt
+Group: Base/Libraries
Requires: %{name} = %{version}-%{release}
%description devel-tools
find %{buildroot}%{_libdir} -type f -name '*.prl' \
-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/" {} \;
# Remove unneeded .la files
-rm -f %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
# We don't need qt5/Qt/
-rm -rf %{buildroot}/%{_includedir}/qt5/Qt
+rm -rf %{buildroot}%{_includedir}/qt5/Qt
# Manually copy qmldevtools static library
-cp lib/libQt5QmlDevTools.a %{buildroot}/%{_libdir}
-%fdupes %{buildroot}/%{_libdir}
-%fdupes %{buildroot}/%{_includedir}
+cp lib/libQt5QmlDevTools.a %{buildroot}%{_libdir}
+%fdupes %{buildroot}%{_libdir}
+%fdupes %{buildroot}%{_includedir}
/sbin/ldconfig
-
-
-
#### File section
%{_libdir}/libQt5Qml.so
%{_libdir}/libQt5Qml.prl
%{_libdir}/pkgconfig/Qt5Qml.pc
-%{_includedir}/qt5/QtQml/
+%{_includedir}/qt5/QtQml
%{_datadir}/qt5/mkspecs/modules/qt_lib_qml.pri
-%{_libdir}/cmake/
+%{_datadir}/qt5/mkspecs/modules/qt_lib_qml_private.pri
+%{_libdir}/cmake
%files qtquick
%{_libdir}/libQt5Quick.so
%{_libdir}/libQt5Quick.prl
%{_libdir}/pkgconfig/Qt5Quick.pc
-%{_includedir}/qt5/QtQuick/
+%{_includedir}/qt5/QtQuick
%{_datadir}/qt5/mkspecs/modules/qt_lib_quick.pri
-
-
-
-
-
+%{_datadir}/qt5/mkspecs/modules/qt_lib_quick_private.pri
%files qmlscene
%defattr(-,root,root,-)
%{_qt5_bindir}/qmlscene
+%files qml
+%defattr(-,root,root,-)
+%{_qt5_bindir}/qml
+
%files devel-tools
%defattr(-,root,root,-)
%{_qt5_bindir}/qmlplugindump
%{_qt5_bindir}/qmltestrunner
%{_qt5_bindir}/qmlmin
%{_qt5_bindir}/qmlbundle
-
+%{_qt5_bindir}/qmlimportscanner
+%{_qt5_bindir}/qmljs
%files import-folderlistmodel
%defattr(-,root,root,-)
%files import-localstorageplugin
%defattr(-,root,root,-)
-%{_libdir}/qt5/qml/QtQuick/LocalStorage/
-
-#%files import-inputcontext
-#%defattr(-,root,root,-)
-#%{_libdir}/qt5/imports/Qt/labs/inputcontext/*
-
-#%files import-particles
-#%defattr(-,root,root,-)
-#%{_libdir}/qt5/imports/Qt/labs/particles/*
+%{_libdir}/qt5/qml/QtQuick/LocalStorage
%files plugin-qmlinspector
%defattr(-,root,root,-)
%files import-qttest
%defattr(-,root,root,-)
-%{_libdir}/qt5/qml/QtTest/
+%{_libdir}/qt5/qml/QtTest
%files import-qtquick2plugin
%defattr(-,root,root,-)
-%{_libdir}/qt5/qml/QtQuick.2/
+%{_libdir}/qt5/qml/QtQuick.2
%files import-particles2
%defattr(-,root,root,-)
-%{_libdir}/qt5/qml/QtQuick/Particles.2/
+%{_libdir}/qt5/qml/QtQuick/Particles.2
%files import-window2
%defattr(-,root,root,-)
-%{_libdir}/qt5/qml/QtQuick/Window.2/
+%{_libdir}/qt5/qml/QtQuick/Window.2
%files import-models2
%defattr(-,root,root,-)
-%{_libdir}/qt5/qml/QtQml/Models.2/
+%{_libdir}/qt5/qml/QtQml/Models.2
%files import-dialogs
%defattr(-,root,root,-)
-%{_libdir}/qt5/qml/QtQuick/Dialogs/
+%{_libdir}/qt5/qml/QtQuick/Dialogs
%files import-privatewidgets
%defattr(-,root,root,-)
-%{_libdir}/qt5/qml/QtQuick/PrivateWidgets/
+%{_libdir}/qt5/qml/QtQuick/PrivateWidgets
%files import-xmllistmodel
%defattr(-,root,root,-)
-%{_libdir}/qt5/qml/QtQuick/XmlListModel/
+%{_libdir}/qt5/qml/QtQuick/XmlListModel
%files qtquicktest-devel
%defattr(-,root,root,-)
-%{_includedir}/qt5/QtQuickTest/
+%{_includedir}/qt5/QtQuickTest
%{_libdir}/libQt5QuickTest.so
%{_libdir}/libQt5QuickTest.prl
%{_libdir}/pkgconfig/Qt5QuickTest.pc
%{_datadir}/qt5/mkspecs/modules/qt_lib_qmltest.pri
+%{_datadir}/qt5/mkspecs/modules/qt_lib_qmltest_private.pri
%files qtquickparticles
%defattr(-,root,root,-)
%{_libdir}/libQt5QuickParticles.so.5
-\f%{_libdir}/libQt5QuickParticles.so.5.*
+%{_libdir}/libQt5QuickParticles.so.5.*
%files qtquickparticles-devel
%defattr(-,root,root,-)
-%{_includedir}/qt5/QtQuickParticles/
+%{_includedir}/qt5/QtQuickParticles
%{_libdir}/libQt5QuickParticles.so
%{_libdir}/libQt5QuickParticles.prl
%{_libdir}/pkgconfig/Qt5QuickParticles.pc
-%{_datadir}/qt5/mkspecs/modules/qt_lib_quickparticles.pri
+%{_datadir}/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri
%files qtdeclarativetools-devel
%defattr(-,root,root,-)
-#%{_includedir}/qt5/QtQmlDevTools/
%{_libdir}/libQt5QmlDevTools.a
%{_libdir}/libQt5QmlDevTools.prl
%{_libdir}/pkgconfig/Qt5QmlDevTools.pc
-%{_datadir}/qt5/mkspecs/modules/qt_lib_qmldevtools.pri
-
-
+%{_datadir}/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri
+%files import-settings
+%{_libdir}/qt5/qml/Qt/labs/settings