Merge branch 'master' into 'master'

Add missing _private .pri files to spec, remove QtWebPluginProcess from spec See merge request !1
sailfishos · Jan 24, 2016 · 4b8ca3d · 4b8ca3d
2 parents 1de328c + 3dc29d5
commit 4b8ca3d
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/rpm/qtwebkit5.spec b/rpm/qtwebkit5.spec
@@ -224,9 +224,6 @@ find %{buildroot}%{_libdir} -type f -name '*.prl' \
 %files uiprocess-launcher
 %defattr(-,root,root,-)
 %{_libdir}/qt5/libexec/QtWebProcess
-%if %{with X11}
-%{_libdir}/qt5/libexec/QtWebPluginProcess
-%endif
 
 %files -n libqtwebkit5
 %defattr(-,root,root,-)
@@ -240,6 +237,7 @@ find %{buildroot}%{_libdir} -type f -name '*.prl' \
 %{_libdir}/libQt5WebKit.so
 %{_libdir}/pkgconfig/Qt5WebKit.pc
 %{_datadir}/qt5/mkspecs/modules/qt_lib_webkit.pri
+%{_datadir}/qt5/mkspecs/modules/qt_lib_webkit_private.pri
 
 %files -n libqtwebkit5-widgets
 %defattr(-,root,root,-)
@@ -253,6 +251,7 @@ find %{buildroot}%{_libdir} -type f -name '*.prl' \
 %{_libdir}/libQt5WebKitWidgets.so
 %{_libdir}/pkgconfig/Qt5WebKitWidgets.pc
 %{_datadir}/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri
+%{_datadir}/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri
 
 %files -n qt5-qtqml-import-webkitplugin
 %defattr(-,root,root,-)