- up to 5.3.0

- some TODOs

diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index 3c7e7793874b3726cb7cbd2eb83a7de7967f9558..1c8b33941be8bb0e0b802d57c56881d6f6e15bab 100644 (file)
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -1,21 +1,23 @@
 # TODO:
+# - package /usr/lib/qt5/libexec correctly
+# - qch
 # - cleanup
 
 %define                orgname         qtwebkit
-Summary:       The Qt5 Webkit
+Summary:       The Qt5 WebKit
 Name:          qt5-%{orgname}
-Version:       5.2.0
-Release:       0.1
+Version:       5.3.0
+Release:       0.2
 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: 1378e18aecd8cc223deb729c8f0a735d
+Source0:       http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
+# Source0-md5: cc9197eaef9e7950e907635f9bde1e98
 URL:           http://qt-project.org/
-BuildRequires: qt5-qtbase-devel = %{version}
-BuildRequires: qt5-qtdeclarative-devel = %{version}
-BuildRequires: qt5-qtsensors-devel = %{version}
-BuildRequires: qt5-qttools-devel = %{version}
+BuildRequires: Qt5Core-devel = %{version}
+BuildRequires: Qt5Quick-devel = %{version}
 BuildRequires: rpmbuild(macros) >= 1.654
+BuildRequires: qt5-build
+BuildRequires: qt5-qmake
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -29,12 +31,19 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 Qt5 Webkit libraries.
 
-%package devel
-Summary:       The Qt5 Webkit - development files
+%package -n Qt5WebKit
+Summary:       The Qt5WebKit library
+Group:         X11/Libraries
+
+%description -n Qt5WebKit
+Qt5 Webkit libraries.
+
+%package -n Qt5WebKit-devel
+Summary:       The Qt5 WebKit - development files
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      Qt5WebKit = %{version}-%{release}
 
-%description devel
+%description -n Qt5WebKit-devel
 Qt5 Webkit - development files.
 
 %package doc
@@ -47,16 +56,6 @@ BuildArch:   noarch
 %description doc
 Qt5 Webkit - documentation.
 
-%package examples
-Summary:       Qt5 Webkit examples
-Group:         X11/Development/Libraries
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
-
-%description examples
-Qt5 Webkit - examples.
-
 %prep
 %setup -q -n %{orgname}-opensource-src-%{version}
 
@@ -73,63 +72,42 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install_docs \
        INSTALL_ROOT=$RPM_BUILD_ROOT
 
-# 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 }'`
-
-       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
-}
-
-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
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post          -p /sbin/ldconfig
-%postun                -p /sbin/ldconfig
+%post -n Qt5WebKit     -p /sbin/ldconfig
+%postun -n Qt5WebKit   -p /sbin/ldconfig
 
-%files
-%if 0
+%files -n Qt5WebKit
 %defattr(644,root,root,755)
-%attr(755,root,root) %ghost %{_libdir}/libQt5Script.so.?
-%attr(755,root,root) %{_libdir}/libQt5Script.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libQt5ScriptTools.so.?
-%attr(755,root,root) %{_libdir}/libQt5ScriptTools.so.*.*
-
-%files devel
+%attr(755,root,root) %ghost %{_libdir}/libQt5WebKit.so.5
+%attr(755,root,root) %{_libdir}/libQt5WebKit.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQt5WebKitWidgets.so.5
+%attr(755,root,root) %{_libdir}/libQt5WebKitWidgets.so.*.*
+%dir %{_libdir}/qt5/qml/QtWebKit
+%attr(755,root,root) %{_libdir}/qt5/qml/QtWebKit/libqmlwebkitplugin.so
+%{_libdir}/qt5/qml/QtWebKit/qmldir
+%dir %{_libdir}/qt5/qml/QtWebKit/experimental
+%attr(755,root,root) %{_libdir}/qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so
+%{_libdir}/qt5/qml/QtWebKit/experimental/qmldir
+%attr(755,root,root) %{_libdir}/qt5/libexec
+
+%files -n Qt5WebKit-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libQt5Script.so
-%attr(755,root,root) %{_libdir}/libQt5ScriptTools.so
-%{_libdir}/libQt5Script.la
-%{_libdir}/libQt5ScriptTools.la
-%{_libdir}/libQt5Script.prl
-%{_libdir}/libQt5ScriptTools.prl
-%{_libdir}/cmake/Qt5Script
-%{_libdir}/cmake/Qt5ScriptTools
-%{_includedir}/qt5/QtScript
-%{_includedir}/qt5/QtScriptTools
-%{_pkgconfigdir}/*.pc
+%attr(755,root,root) %{_libdir}/libQt5WebKit.so
+%attr(755,root,root) %{_libdir}/libQt5WebKitWidgets.so
+%{_libdir}/libQt5WebKit.la
+%{_libdir}/libQt5WebKitWidgets.la
+%{_libdir}/libQt5WebKit.prl
+%{_libdir}/libQt5WebKitWidgets.prl
+%{_libdir}/cmake/Qt5WebKit
+%{_libdir}/cmake/Qt5WebKitWidgets
+%{_includedir}/qt5/QtWebKit
+%{_includedir}/qt5/QtWebKitWidgets
+%{_pkgconfigdir}/Qt5WebKit.pc
+%{_pkgconfigdir}/Qt5WebKitWidgets.pc
 %{_qtdir}/mkspecs
-%endif
 
 %files doc
 %defattr(644,root,root,755)
 %{_docdir}/qt5-doc
-
-%files examples -f examples.files