- 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 7c8aa022e86d6c8ac806fe08e1f3fd11ac2a9524..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}
@@ -120,7 +119,7 @@ BuildRequires:      pkgconfig
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 %{?with_qm:BuildRequires:      qt5-linguist >= 5.2}
 %{?with_doc:BuildRequires:     qt5-assistant >= 5.9}
-BuildRequires: rpmbuild(macros) >= 1.654
+BuildRequires: rpmbuild(macros) >= 1.752
 BuildRequires: sed >= 4.0
 %{?with_sqlite2:BuildRequires: sqlite-devel}
 %{?with_sqlite3:BuildRequires: sqlite3-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.
@@ -616,6 +615,7 @@ Summary:    Qt5 Gui platform theme plugin for GTK+ 3.x
 Summary(pl.UTF-8):     Wtyczka motywów platform Qt5 Gui dla GTK+ 3.x
 Group:         Libraries
 Requires:      Qt5Gui = %{version}-%{release}
+Obsoletes:     Qt5Gui-platformtheme-gtk2 < 5.8
 
 %description -n Qt5Gui-platformtheme-gtk3
 Qt5 Gui platform theme plugin for GTK+ 3.x.
@@ -1003,20 +1003,6 @@ Header files for Qt5 Test library.
 %description -n Qt5Test-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki Qt5 Test.
 
-%package -n -devel
-Summary:       library - development files
-Summary(pl.UTF-8):     Biblioteka  - pliki programistyczne
-Group:         Development/Libraries
-# for (subset of) Qt5Core headers
-Requires:      Qt5Core-devel = %{version}-%{release}
-Requires:      zlib-devel >= 1.0.8
-
-%description -n -devel
-library - development files.
-
-%description -n -devel -l pl.UTF-8
-Biblioteka - pliki programistyczne.
-
 %package -n Qt5VulkanSupport-devel
 Summary:       Qt5 VulkanSupport library - development files
 Summary(pl.UTF-8):     Biblioteka Qt5 VulkanSupport - pliki programistyczne
@@ -1106,9 +1092,7 @@ Pliki nagłówkowe biblioteki Qt5 Xml.
 Summary:       Common part of Qt5 documentation
 Summary(pl.UTF-8):     Część wspólna dokumentacji do Qt5
 Group:         Documentation
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description -n qt5-doc-common
 Common part of Qt5 documentation, global for all components.
@@ -1122,38 +1106,35 @@ Summary:        Qt5 application framework base components documentation in HTML format
 Summary(pl.UTF-8):     Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w formacie HTML
 Group:         Documentation
 Requires:      qt5-doc-common = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description doc
-Qt5 application framework base components documentation in HTML format.
+Qt5 application framework base components documentation in HTML
+format.
 
 %description doc -l pl.UTF-8
-Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w formacie HTML.
+Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w
+formacie HTML.
 
 %package doc-qch
 Summary:       Qt5 application framework base components documentation in QCH format
 Summary(pl.UTF-8):     Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w formacie QCH
 Group:         Documentation
 Requires:      qt5-doc-common = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description doc-qch
 Qt5 application framework base components documentation in QCH format.
 
 %description doc-qch -l pl.UTF-8
-Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w formacie QCH.
+Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w
+formacie QCH.
 
 %package examples
 Summary:       Examples for Qt5 application framework base components
 Summary(pl.UTF-8):     Przykłady do podstawowych komponentów szkieletu aplikacji Qt5
 Group:         X11/Development/Libraries
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description examples
 Examples for Qt5 application framework base components.