- glib2 is private dependency for Core, but required by EventDispatcherSupport-devel

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

diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 09b187289a0b1ae18a49bb519accf6b94fb9af17..5077fab7d1a00094abd2267b9f2bfc66b97fc611 100644 (file)
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -72,15 +72,14 @@ Summary(pl.UTF-8):  Biblioteka Qt5 - podstawowe komponenty
 Name:          qt5-%{orgname}
 Version:       5.15.2
 Release:       2
-# See LGPL_EXCEPTION.txt for exception details
-License:       LGPL v2 with Digia Qt LGPL Exception v1.1 or GPL v3
+License:       LGPL v3 or GPL v2 or GPL v3 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: 0eb522ff6c2194f9690cbdcd5b33e803
 Source1:       http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz
 # Source1-md5: 9b66cdb64402e8fd9e843f8a7120abb1
 Patch0:                %{name}-system_cacerts.patch
-URL:           http://www.qt.io/
+URL:           https://www.qt.io/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
 BuildRequires: EGL-devel
 %{?with_ibase:BuildRequires:   Firebird-devel}
@@ -232,7 +231,7 @@ Group:              Libraries
 Requires:      pcre2-16 >= 10.20
 Requires:      zlib >= 1.0.8
 Requires:      zstd >= 1.3
-Obsoletes:     qt5-qtbase
+Obsoletes:     qt5-qtbase < 5.2.0-1
 
 %description -n Qt5Core
 Qt5 Core library provides core non-GUI functionality.
@@ -246,12 +245,11 @@ Summary:  Qt5 Core library - development files
 Summary(pl.UTF-8):     Biblioteka Qt5 Core - pliki programistyczne
 Group:         Development/Libraries
 Requires:      Qt5Core = %{version}-%{release}
-Requires:      glib2-devel >= 2.0
 Requires:      libicu-devel
 Requires:      libstdc++-devel >= 6:4.7
 Requires:      pcre2-16-devel >= 10.20
 Requires:      zlib-devel >= 1.0.8
-Obsoletes:     qt5-qtbase-devel
+Obsoletes:     qt5-qtbase-devel < 5.2.0-1
 
 %description -n Qt5Core-devel
 Header files for Qt5 Core library.
@@ -333,6 +331,7 @@ Summary(pl.UTF-8):  Biblioteka Qt5 EventDispatcherSupport - pliki programistyczne
 Group:         Development/Libraries
 # for (subset of) Qt5Core headers
 Requires:      Qt5Core-devel = %{version}-%{release}
+Requires:      glib2-devel >= 2.0
 
 %description -n Qt5EventDispatcherSupport-devel
 Qt5 EventDispatcherSupport library - development files.