- unconditional noarch subpackages

[packages/qt5-qtdeclarative.git] / qt5-qtdeclarative.spec

diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index 7d3233f5201c1d9703e1b8ea32d149471862eab2..8a27f0a0e3e24745b38bc37c4ec1c07cb66e8a98 100644 (file)
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -26,7 +26,7 @@ Summary(pl.UTF-8):    Biblioteki Qt5 Declarative
 Name:          qt5-%{orgname}
 Version:       5.15.2
 Release:       3
-License:       LGPL v2.1 with Digia Qt LGPL Exception v1.1 or GPL v3.0
+License:       LGPL v2.1 or LGPL v3 with Qt Company LGPL Exception v1.1
 Group:         X11/Libraries
 Source0:       http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
 # Source0-md5: db3c185d6f13fc60828f8f9f20e092c4
@@ -129,7 +129,7 @@ Group:              Development/Libraries
 Requires:      Qt5Core-devel >= %{qtbase_ver}
 Requires:      Qt5Network-devel >= %{qtbase_ver}
 Requires:      Qt5Qml = %{version}-%{release}
-Obsoletes:     qt5-qtdeclarative-devel
+Obsoletes:     qt5-qtdeclarative-devel < 5.2.1-1
 
 %description -n Qt5Qml-devel
 Qt5 Qml libraries - development files.
@@ -207,7 +207,7 @@ Summary:    Qt5 Declarative documentation in HTML format
 Summary(pl.UTF-8):     Dokumentacja do bibliotek Qt5 Declarative w formacie HTML
 Group:         Documentation
 Requires:      qt5-doc-common >= %{qtbase_ver}
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description doc
 Qt5 Declarative documentation in HTML format.
@@ -220,7 +220,7 @@ Summary:    Qt5 Declarative documentation in QCH format
 Summary(pl.UTF-8):     Dokumentacja do bibliotek Qt5 Declarative w formacie QCH
 Group:         Documentation
 Requires:      qt5-doc-common >= %{qtbase_ver}
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description doc-qch
 Qt5 Declarative documentation in QCH format.
@@ -232,7 +232,7 @@ Dokumentacja do bibliotek Qt5 Declarative w formacie QCH.
 Summary:       Qt5 Declarative examples
 Summary(pl.UTF-8):     Przykłady do bibliotek Qt5 Declarative
 Group:         X11/Development/Libraries
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description examples
 Qt5 Declarative examples.