commit 9a71b2a3f2ee91c0c11038c2992b58efdda52443
Author: Jakub Bogusz <[email protected]>
Date: Sat Dec 19 20:44:42 2020 +0100
- updated dependencies, noarch rules, licensing information
qt5-qtconnectivity.spec | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/qt5-qtconnectivity.spec b/qt5-qtconnectivity.spec
index 3855326..c1f38b8 100644
--- a/qt5-qtconnectivity.spec
+++ b/qt5-qtconnectivity.spec
@@ -12,16 +12,17 @@ Summary(pl.UTF-8): Biblioteki Qt5 Connectivity
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: 98ec17cf9b3181993e0bb6b599b1b9e7
Source1:
http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz
# Source1-md5: 9b66cdb64402e8fd9e843f8a7120abb1
-URL: http://www.qt.io/
+URL: https://www.qt.io/
BuildRequires: Qt5Concurrent-devel >= %{qtbase_ver}
BuildRequires: Qt5Core-devel >= %{qtbase_ver}
BuildRequires: Qt5DBus-devel >= %{qtbase_ver}
+BuildRequires: Qt5Network-devel >= %{qtbase_ver}
BuildRequires: Qt5Qml-devel >= %{qtdeclarative_ver}
BuildRequires: bluez-libs-devel
%if %{with doc}
@@ -30,7 +31,7 @@ BuildRequires: qt5-assistant >= %{qttools_ver}
BuildRequires: qt5-build >= %{qtbase_ver}
%{?with_qm:BuildRequires: qt5-linguist >= %{qttools_ver}}
BuildRequires: qt5-qmake >= %{qtbase_ver}
-BuildRequires: rpmbuild(macros) >= 1.654
+BuildRequires: rpmbuild(macros) >= 1.752
BuildRequires: tar >= 1:1.22
BuildRequires: xz
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -73,6 +74,7 @@ Group: Libraries
Requires: %{name}-common = %{version}-%{release}
Requires: Qt5Core >= %{qtbase_ver}
Requires: Qt5DBus >= %{qtbase_ver}
+Requires: Qt5Network >= %{qtbase_ver}
Requires: Qt5Qml >= %{qtdeclarative_ver}
Obsoletes: qt5-qtconnectivity
@@ -138,9 +140,7 @@ Summary: Qt5 Connectivity documentation in HTML format
Summary(pl.UTF-8): Dokumentacja do bibliotek Qt5 Connectivity w formacie
HTML
Group: Documentation
Requires: qt5-doc-common >= %{qtbase_ver}
-%if "%{_rpmversion}" >= "5"
-BuildArch: noarch
-%endif
+%{?noarchpackage}
%description doc
Qt5 Connectivity documentation in HTML format.
@@ -153,9 +153,7 @@ Summary: Qt5 Connectivity documentation in QCH format
Summary(pl.UTF-8): Dokumentacja do bibliotek Qt5 Connectivity w formacie
QCH
Group: Documentation
Requires: qt5-doc-common >= %{qtbase_ver}
-%if "%{_rpmversion}" >= "5"
-BuildArch: noarch
-%endif
+%{?noarchpackage}
%description doc-qch
Qt5 Connectivity documentation in QCH format.
@@ -167,9 +165,7 @@ Dokumentacja do bibliotek Qt5 Connectivity w formacie QCH.
Summary: Qt5 Connectivity examples
Summary(pl.UTF-8): Przykłady do bibliotek Qt5 Connectivity
Group: X11/Development/Libraries
-%if "%{_rpmversion}" >= "5"
-BuildArch: noarch
-%endif
+%{?noarchpackage}
%description examples
Qt5 Connectivity examples.
@@ -194,6 +190,7 @@ cd ..
%install
rm -rf $RPM_BUILD_ROOT
+
%{__make} install \
INSTALL_ROOT=$RPM_BUILD_ROOT
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtconnectivity.git/commitdiff/9a71b2a3f2ee91c0c11038c2992b58efdda52443
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
