- (.so and examples) file permission fixes, updated noarch rules, drop Obsoletes...

diff --git a/qt5-qtquickcontrols2.spec b/qt5-qtquickcontrols2.spec
index 88c867c229de1ce6f360b7125a7e93d97ba9c238..03cea9e37a082dd36e2df1ccbd8445549f577094 100644 (file)
--- a/qt5-qtquickcontrols2.spec
+++ b/qt5-qtquickcontrols2.spec
@@ -12,7 +12,7 @@ Summary(pl.UTF-8):    Moduły Qt5 Quick Controls2
 Name:          qt5-%{orgname}
 Version:       5.15.2
 Release:       2
-License:       LGPL v3 or GPL v2 or commercial
+License:       LGPL v3 or GPL v2+ or commercial
 Group:         X11/Libraries
 Source0:       http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
 # Source0-md5: 2abc5e7b8e6b4a80d7533daad37749e9
@@ -64,7 +64,6 @@ Requires:     Qt5Gui >= %{qtbase_ver}
 Requires:      Qt5Qml >= %{qtdeclarative_ver}
 Requires:      Qt5Quick >= %{qtdeclarative_ver}
 Requires:      Qt5Widgets >= %{qtbase_ver}
-Obsoletes:     qt5-qtquickcontrols2
 
 %description -n Qt5Quick-controls2
 Qt5 Quick Controls, Dialogs modules.
@@ -98,9 +97,7 @@ Summary:      Qt5 Quick Controls2 documentation in HTML format
 Summary(pl.UTF-8):     Dokumentacja do biblioteki Qt5 Quick Controls2 w formacie HTML
 Group:         Documentation
 Requires:      qt5-doc-common >= %{qtbase_ver}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description doc
 Qt5 Quick Controls2 documentation in HTML format.
@@ -113,9 +110,7 @@ Summary:    Qt5 Quick Controls2 documentation in QCH format
 Summary(pl.UTF-8):     Dokumentacja do biblioteki Qt5 Quick Controls w formacie QCH
 Group:         Documentation
 Requires:      qt5-doc-common >= %{qtbase_ver}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description doc-qch
 Qt5 Quick Controls2 documentation in QCH format.
@@ -127,7 +122,7 @@ Dokumentacja do biblioteki Qt5 Quick Controls2 w formacie QCH.
 Summary:       Examples for Qt5 Quick Controls2
 Summary(pl.UTF-8):     Przykłady do Qt5 Quick controls2
 Group:         X11/Development/Libraries
-BuildArch:     noarch
+%{?noarchpackage}
 
 %description examples
 Examples for Qt5 Quick Controls2.
@@ -152,6 +147,7 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
        INSTALL_ROOT=$RPM_BUILD_ROOT
 
@@ -167,6 +163,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/qt5/translations/{assistant,designer,linguist,qt,qtbase,qtconnectivity,qtdeclarative,qtlocation,qtmultimedia,qtquickcontrols,qtserialport,qtscript,qtwebengine,qtwebsockets,qtxmlpatterns}_*.qm
 %endif
 
+# useless symlinks
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libQt5*.so.5.??
+# drop *.la, follow policy of not packaging them when *.pc exist
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libQt5*.la
+
 # find_lang --with-qm supports only PLD qt3/qt4 specific %{_localedir}/*/LC_MESSAGES layout
 find_qt5_qm()
 {
@@ -181,6 +182,31 @@ echo '%defattr(644,root,root,755)' > qtquickcontrols2.lang
 find_qt5_qm qtquickcontrols2 >> qtquickcontrols2.lang
 %endif
 
+# Prepare some files list
+ifecho() {
+       r="$RPM_BUILD_ROOT$2"
+       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
+}
+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_tree examples %{_examplesdir}/qt5/quickcontrols2
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -190,28 +216,73 @@ rm -rf $RPM_BUILD_ROOT
 %files -n Qt5Quick-controls2 -f qtquickcontrols2.lang
 %defattr(644,root,root,755)
 %doc dist/changes-*
-%ghost %{_libdir}/libQt5QuickControls2.so.5
-%{_libdir}/libQt5QuickControls2.so.5.*
-%ghost %{_libdir}/libQt5QuickTemplates2.so.5
-%{_libdir}/libQt5QuickTemplates2.so.5.*
-%{_libdir}/qt5/qml/Qt/labs
-%{_libdir}/qt5/qml/QtQuick/Controls.2
-%{_libdir}/qt5/qml/QtQuick/Templates.2
+# R: Core Gui Qml Quick QuickTemplates2
+%attr(755,root,root) %{_libdir}/libQt5QuickControls2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQt5QuickControls2.so.5
+# R: Core Gui Qml QmlModels Quick
+%attr(755,root,root) %{_libdir}/libQt5QuickTemplates2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQt5QuickTemplates2.so.5
+%dir %{_libdir}/qt5/qml/Qt/labs/calendar
+# R: Core Gui Qml Quick QuickTemplates2
+%attr(755,root,root) %{_libdir}/qt5/qml/Qt/labs/calendar/libqtlabscalendarplugin.so
+%{_libdir}/qt5/qml/Qt/labs/calendar/plugins.qmltypes
+%{_libdir}/qt5/qml/Qt/labs/calendar/qmldir
+%{_libdir}/qt5/qml/Qt/labs/calendar/*.qml
+%{_libdir}/qt5/qml/Qt/labs/calendar/*.qmlc
+%dir %{_libdir}/qt5/qml/Qt/labs/platform
+# R: Core Gui Qml Quick QuickTemplates2 Widgets
+%attr(755,root,root) %{_libdir}/qt5/qml/Qt/labs/platform/libqtlabsplatformplugin.so
+%{_libdir}/qt5/qml/Qt/labs/platform/plugins.qmltypes
+%{_libdir}/qt5/qml/Qt/labs/platform/qmldir
+%dir %{_libdir}/qt5/qml/QtQuick/Controls.2
+# R: Core Gui Qml Quick QuickControls2 QuickTemplates2
+%attr(755,root,root) %{_libdir}/qt5/qml/QtQuick/Controls.2/libqtquickcontrols2plugin.so
+%{_libdir}/qt5/qml/QtQuick/Controls.2/plugins.qmltypes
+%{_libdir}/qt5/qml/QtQuick/Controls.2/qmldir
+%{_libdir}/qt5/qml/QtQuick/Controls.2/*.qml
+%{_libdir}/qt5/qml/QtQuick/Controls.2/designer
+%dir %{_libdir}/qt5/qml/QtQuick/Controls.2/Fusion
+# R: Core Gui Qml Quick QuickControls2 QuickTemplates2
+%attr(755,root,root) %{_libdir}/qt5/qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin.so
+%{_libdir}/qt5/qml/QtQuick/Controls.2/Fusion/plugins.qmltypes
+%{_libdir}/qt5/qml/QtQuick/Controls.2/Fusion/qmldir
+%{_libdir}/qt5/qml/QtQuick/Controls.2/Fusion/*.qml
+%dir %{_libdir}/qt5/qml/QtQuick/Controls.2/Imagine
+# R: Core Gui Qml Quick QuickControls2 QuickTemplates2
+%attr(755,root,root) %{_libdir}/qt5/qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so
+%{_libdir}/qt5/qml/QtQuick/Controls.2/Imagine/plugins.qmltypes
+%{_libdir}/qt5/qml/QtQuick/Controls.2/Imagine/qmldir
+%{_libdir}/qt5/qml/QtQuick/Controls.2/Imagine/*.qml
+%dir %{_libdir}/qt5/qml/QtQuick/Controls.2/Material
+# R: Core Gui Qml Quick QuickControls2 QuickTemplates2
+%attr(755,root,root) %{_libdir}/qt5/qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so
+%{_libdir}/qt5/qml/QtQuick/Controls.2/Material/plugins.qmltypes
+%{_libdir}/qt5/qml/QtQuick/Controls.2/Material/qmldir
+%{_libdir}/qt5/qml/QtQuick/Controls.2/Material/*.qml
+%dir %{_libdir}/qt5/qml/QtQuick/Controls.2/Universal
+# R: Core Gui Qml Quick QuickControls2 QuickTemplates2
+%attr(755,root,root) %{_libdir}/qt5/qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so
+%{_libdir}/qt5/qml/QtQuick/Controls.2/Universal/plugins.qmltypes
+%{_libdir}/qt5/qml/QtQuick/Controls.2/Universal/qmldir
+%{_libdir}/qt5/qml/QtQuick/Controls.2/Universal/*.qml
+%dir %{_libdir}/qt5/qml/QtQuick/Templates.2
+# R: Core Gui Qml Quick QuickTemplates2
+%attr(755,root,root) %{_libdir}/qt5/qml/QtQuick/Templates.2/libqtquicktemplates2plugin.so
+%{_libdir}/qt5/qml/QtQuick/Templates.2/plugins.qmltypes
+%{_libdir}/qt5/qml/QtQuick/Templates.2/qmldir
 
 %files -n Qt5Quick-controls2-devel
 %defattr(644,root,root,755)
-%{_includedir}/qt5/QtQuickControls2
-%{_includedir}/qt5/QtQuickTemplates2
-%{_libdir}/cmake/Qt5QuickControls2
-%{_libdir}/cmake/Qt5QuickTemplates2
-%{_libdir}/libQt5QuickControls2.la
+%attr(755,root,root) %{_libdir}/libQt5QuickControls2.so
 %{_libdir}/libQt5QuickControls2.prl
-%{_libdir}/libQt5QuickControls2.so
-%{_libdir}/libQt5QuickTemplates2.la
+%attr(755,root,root) %{_libdir}/libQt5QuickTemplates2.so
 %{_libdir}/libQt5QuickTemplates2.prl
-%{_libdir}/libQt5QuickTemplates2.so
+%{_includedir}/qt5/QtQuickControls2
+%{_includedir}/qt5/QtQuickTemplates2
 %{_pkgconfigdir}/Qt5QuickControls2.pc
 %{_pkgconfigdir}/Qt5QuickTemplates2.pc
+%{_libdir}/cmake/Qt5QuickControls2
+%{_libdir}/cmake/Qt5QuickTemplates2
 %{_libdir}/qt5/mkspecs/modules/qt_lib_quickcontrols2.pri
 %{_libdir}/qt5/mkspecs/modules/qt_lib_quickcontrols2_private.pri
 %{_libdir}/qt5/mkspecs/modules/qt_lib_quicktemplates2.pri
@@ -231,6 +302,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/qt5-doc/qtquickcontrols.qch
 %endif
 
-%files examples
+%files examples -f examples.files
 %defattr(644,root,root,755)
-%{_examplesdir}/qt5/quickcontrols2
+# XXX: dir shared with qt5-qtbase-examples
+%dir %{_examplesdir}/qt5