- updated noarch rules and licensing information

diff --git a/qt5-qtserialport.spec b/qt5-qtserialport.spec
index fae0282952a5272453c904a2fe19adb42445719d..e118f957021e65f9ba0e857864efe1497e3ed470 100644 (file)
--- a/qt5-qtserialport.spec
+++ b/qt5-qtserialport.spec
@@ -10,11 +10,11 @@ Summary(pl.UTF-8):  Biblioteka Qt5 SerialPort
 Name:          qt5-%{orgname}
 Version:       5.15.2
 Release:       2
-License:       LGPL v2.1 with Digia Qt LGPL Exception v1.1 or GPL v3.0
+License:       LGPL v3 or GPL v2 or GPL v3 or commercial
 Group:         Libraries
 Source0:       http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
 # Source0-md5: ae1506fc8adc811e0aefff9aff70de3b
-URL:           http://www.qt.io/
+URL:           https://www.qt.io/
 BuildRequires: Qt5Core-devel >= %{qtbase_ver}
 BuildRequires: Qt5Gui-devel >= %{qtbase_ver}
 BuildRequires: Qt5Widgets-devel >= %{qtbase_ver}
@@ -23,7 +23,7 @@ BuildRequires:        qt5-assistant >= %{qttools_ver}
 %endif
 BuildRequires: qt5-build >= %{qtbase_ver}
 BuildRequires: qt5-qmake >= %{qtbase_ver}
-BuildRequires: rpmbuild(macros) >= 1.654
+BuildRequires: rpmbuild(macros) >= 1.752
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel
 BuildRequires: xz
@@ -82,9 +82,7 @@ Summary:      Qt5 SerialPort documentation in HTML format
 Summary(pl.UTF-8):     Dokumentacja do biblioteki Qt5 SerialPort w formacie HTML
 Group:         Documentation
 Requires:      qt5-doc-common >= %{qtbase_ver}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description doc
 Qt5 SerialPort documentation in HTML format.
@@ -97,9 +95,7 @@ Summary:      Qt5 SerialPort documentation in QCH format
 Summary(pl.UTF-8):     Dokumentacja do biblioteki Qt5 SerialPort w formacie QCH
 Group:         Documentation
 Requires:      qt5-doc-common >= %{qtbase_ver}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description doc-qch
 Qt5 SerialPort documentation in QCH format.
@@ -111,9 +107,7 @@ Dokumentacja do biblioteki Qt5 SerialPort w formacie QCH.
 Summary:       Qt5 SerialPort examples
 Summary(pl.UTF-8):     Przykłady do biblioteki Qt5 SerialPort
 Group:         Development/Libraries
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description examples
 Qt5 SerialPort examples.