- updated to 5.3.0, build docs, added Qt5Designer plugin

diff --git a/qt5-qtquick1.spec b/qt5-qtquick1.spec
index eb21f190a149e8f63b47c14a156e53d5b1966518..43e8cc9ad96b1940b81cfd8c2d2264847b2c548b 100644 (file)
--- a/qt5-qtquick1.spec
+++ b/qt5-qtquick1.spec
@@ -1,5 +1,3 @@
-# TODO:
-# - cleanup
 #
 # Conditional build:
 %bcond_without qch     # documentation in QCH format
@@ -13,21 +11,30 @@
 Summary:       The Qt5 Quick1 (Qt5Declarative) library
 Summary(pl.UTF-8):     Biblioteka Qt5 Quick1 (Qt5Declarative)
 Name:          qt5-%{orgname}
-Version:       5.2.0
-Release:       0.1
+Version:       5.3.0
+Release:       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: 4535ff78b5a9a18ffba702298a48e22e
+Source0:       http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
+# Source0-md5: cd6ffd4a29f7050f71670e7afec09e5d
 URL:           http://qt-project.org/
+BuildRequires: Qt5Core-devel >= %{qtbase_ver}
+BuildRequires: Qt5Designer-devel >= %{qttools_ver}
+BuildRequires: Qt5Gui-devel >= %{qtbase_ver}
+BuildRequires: Qt5Network-devel >= %{qtbase_ver}
+BuildRequires: Qt5OpenGL-devel >= %{qtbase_ver}
+BuildRequires: Qt5Script-devel >= %{qtscript_ver}
+BuildRequires: Qt5Sql-devel >= %{qtbase_ver}
+#TODO: BuildRequires:  Qt5WebkitWidgets-devel >= %{qtwebkit_ver}
+BuildRequires: Qt5Widgets-devel >= %{qtbase_ver}
+BuildRequires: Qt5XmlPatterns-devel >= %{qtxmlpatterns_ver}
 %if %{with qch}
 BuildRequires: qt5-assistant >= %{qttools_ver}
 %endif
-BuildRequires: qt5-qtbase-devel >= %{qtbase_ver}
-BuildRequires: qt5-qtdeclarative-devel >= %{qtdeclarative_ver}
-BuildRequires: qt5-qtscript-devel >= %{qtscript_ver}
-BuildRequires: qt5-qtxmlpatterns-devel >= %{qtdeclarative_ver}
+BuildRequires: qt5-build >= %{qtbase_ver}
+BuildRequires: qt5-qmake >= %{qtbase_ver}
 BuildRequires: rpmbuild(macros) >= 1.654
+BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,19 +62,35 @@ Summary:    The Qt5 Quick1 (Qt5Declarative) library
 Summary(pl.UTF-8):     Biblioteka Qt5 Quick1 (Qt5Declarative)
 Group:         X11/Libraries
 Requires:      Qt5Core >= %{qtbase_ver}
+Requires:      Qt5Gui >= %{qtbase_ver}
+Requires:      Qt5Network >= %{qtbase_ver}
+Requires:      Qt5Script >= %{qtscript_ver}
+Requires:      Qt5Sql >= %{qtbase_ver}
+Requires:      Qt5Widgets >= %{qtbase_ver}
+Requires:      Qt5XmlPatterns >= %{qtxmlpatterns_ver}
 Obsoletes:     qt5-qtquick1
 
 %description -n Qt5Declarative
-Qt5 Quick1 (Qt5Declarative) library FIXME.
+Qt5 Quick1 (Qt5Declarative) library - an older version of Quick
+library.
 
 %description -n Qt5Declarative -l pl.UTF-8
-Biblioteka Qt5 Quick1 (Qt5Declarative).
+Biblioteka Qt5 Quick1 (Qt5Declarative) - starsza wersja biblioteki
+Quick.
 
 %package -n Qt5Declarative-devel
 Summary:       Qt5 Quick1 (Qt5Declarative) library - development files
 Summary(pl.UTF-8):     Biblioteka Qt5 Quick1 (Qt5Declarative) - pliki programistyczne
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      OpenGL-devel
+Requires:      Qt5Core-devel >= %{qtbase_ver}
+Requires:      Qt5Gui-devel >= %{qtbase_ver}
+Requires:      Qt5Network-devel >= %{qtbase_ver}
+Requires:      Qt5Script-devel >= %{qtscript_ver}
+Requires:      Qt5Sql-devel >= %{qtbase_ver}
+Requires:      Qt5Widgets-devel >= %{qtbase_ver}
+Requires:      Qt5XmlPatterns-devel >= %{qtxmlpatterns_ver}
 Obsoletes:     qt5-qtquick1-devel
 
 %description -n Qt5Declarative-devel
@@ -76,6 +99,20 @@ Qt5 Quick1 (Qt5Declarative) library - development files.
 %description -n Qt5Declarative-devel -l pl.UTF-8
 Biblioteka Qt5 Quick1 (Qt5Declarative) - pliki programistyczne.
 
+%package -n Qt5Designer-qdeclarativeview
+Summary:       QDeclarativeView (Quick1) plugin for Qt5 Designer
+Summary(pl.UTF-8):     Wtyczka QDeclarativeView (Quick1) dla Qt5 Designera
+Group:         X11/Libraries
+Requires:      Qt5Declarative = %{version}-%{release}
+Requires:      Qt5Designer >= %{qttools_ver}
+Requires:      Qt5Widgets >= %{qtbase_ver}
+
+%description -n Qt5Designer-qdeclarativeview
+QDeclarativeView (Quick1) plugin for Qt5 Designer.
+
+%description -n Qt5Designer-qdeclarativeview -l pl.UTF-8
+Wtyczka QDeclarativeView (Quick1) dla Qt5 Designera.
+
 %package doc
 Summary:       Qt5 Quick1 (Qt5Declarative) documentation in HTML format
 Summary(pl.UTF-8):     Dokumentacja do biblioteki Qt5 Quick1 (Qt5Declarative) w formacie HTML
@@ -123,6 +160,9 @@ Przykłady do biblioteki Qt5 Quick1 (Qt5Declarative).
 %prep
 %setup -q -n %{orgname}-opensource-src-%{version}
 
+# enable docs
+%{__sed} -i -e '/^# SUBDIRS += doc/s/^# //' src/src.pro
+
 %build
 qmake-qt5
 %{__make}
@@ -141,12 +181,15 @@ rm -rf $RPM_BUILD_ROOT
 # actually drop *.la, follow policy of not packaging them when *.pc exist
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libQt5*.la
 
+# symlinks in system bin dir
+install -d $RPM_BUILD_ROOT%{_bindir}
+for f in qml1plugindump qmlviewer ; 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
@@ -159,12 +202,15 @@ 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/declarative
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -174,11 +220,36 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n Qt5Declarative
 %defattr(644,root,root,755)
+%doc LGPL_EXCEPTION.txt dist/changes-*
 %attr(755,root,root) %{_libdir}/libQt5Declarative.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQt5Declarative.so.5
-%attr(755,root,root) %{qt5dir}/bin/*
-%attr(755,root,root) %{qt5dir}/imports
-%attr(755,root,root) %{qt5dir}/plugins/*
+%attr(755,root,root) %{_bindir}/qml1plugindump-qt5
+%attr(755,root,root) %{_bindir}/qmlviewer-qt5
+%attr(755,root,root) %{qt5dir}/bin/qml1plugindump
+%attr(755,root,root) %{qt5dir}/bin/qmlviewer
+%dir %{qt5dir}/imports
+%{qt5dir}/imports/builtins.qmltypes
+%dir %{qt5dir}/imports/Qt
+%dir %{qt5dir}/imports/Qt/labs
+%dir %{qt5dir}/imports/Qt/labs/folderlistmodel
+%attr(755,root,root) %{qt5dir}/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
+%{qt5dir}/imports/Qt/labs/folderlistmodel/plugins.qmltypes
+%{qt5dir}/imports/Qt/labs/folderlistmodel/qmldir
+%dir %{qt5dir}/imports/Qt/labs/gestures
+%attr(755,root,root) %{qt5dir}/imports/Qt/labs/gestures/libqmlgesturesplugin.so
+%{qt5dir}/imports/Qt/labs/gestures/plugins.qmltypes
+%{qt5dir}/imports/Qt/labs/gestures/qmldir
+%dir %{qt5dir}/imports/Qt/labs/particles
+%attr(755,root,root) %{qt5dir}/imports/Qt/labs/particles/libqmlparticlesplugin.so
+%{qt5dir}/imports/Qt/labs/particles/plugins.qmltypes
+%{qt5dir}/imports/Qt/labs/particles/qmldir
+%dir %{qt5dir}/imports/Qt/labs/shaders
+%attr(755,root,root) %{qt5dir}/imports/Qt/labs/shaders/libqmlshadersplugin.so
+%{qt5dir}/imports/Qt/labs/shaders/plugins.qmltypes
+%{qt5dir}/imports/Qt/labs/shaders/qmldir
+%dir %{qt5dir}/plugins/qml1tooling
+%attr(755,root,root) %{qt5dir}/plugins/qml1tooling/libqmldbg_inspector.so
+%attr(755,root,root) %{qt5dir}/plugins/qml1tooling/libqmldbg_tcp_qtdeclarative.so
 
 %files -n Qt5Declarative-devel
 %defattr(644,root,root,755)
@@ -187,6 +258,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtDeclarative
 %{_pkgconfigdir}/Qt5Declarative.pc
 %{_libdir}/cmake/Qt5Declarative
-%{qt5dir}/mkspecs/modules/*.pri
+%{qt5dir}/mkspecs/modules/qt_lib_declarative.pri
+%{qt5dir}/mkspecs/modules/qt_lib_declarative_private.pri
+
+%files -n Qt5Designer-qdeclarativeview
+%defattr(644,root,root,755)
+%attr(755,root,root) %{qt5dir}/plugins/designer/libqdeclarativeview.so
+%{_libdir}/cmake/Qt5Designer/Qt5Designer_QDeclarativeViewPlugin.cmake
+
+%files doc
+%defattr(644,root,root,755)
+%{_docdir}/qt5-doc/qtdeclarative
+
+%if %{with qch}
+%files doc-qch
+%defattr(644,root,root,755)
+%{_docdir}/qt5-doc/qtdeclarative.qch
+%endif
 
 %files examples -f examples.files
+# XXX: dir shared with qt5-qtbase-examples
+%dir %{_examplesdir}/qt5