[packages/qt5-qtx11extras] - updated noarch rules and licensing information, drop unnecessary OpenGL-devel dependency

qboosh qboosh at pld-linux.org
Fri Dec 18 23:08:43 CET 2020


commit ab8ceb5890a0c733178c6f2d1e1f0fc183d89180
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Dec 18 23:08:14 2020 +0100

    - updated noarch rules and licensing information, drop unnecessary OpenGL-devel dependency

 qt5-qtx11extras.spec | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/qt5-qtx11extras.spec b/qt5-qtx11extras.spec
index 09ce8d1..75d2be2 100644
--- a/qt5-qtx11extras.spec
+++ b/qt5-qtx11extras.spec
@@ -10,11 +10,11 @@ Summary(pl.UTF-8):	Biblioteka Qt5 X11 Extras
 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:		X11/Libraries
 Source0:	http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
 # Source0-md5:	92cf72015788bb4dcab14494f2835b32
-URL:		http://www.qt.io/
+URL:		https://www.qt.io/
 BuildRequires:	Qt5Core-devel >= %{qtbase_ver}
 BuildRequires:	Qt5Gui-devel >= %{qtbase_ver}
 %if %{with doc}
@@ -22,7 +22,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:	xz
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -65,7 +65,6 @@ dla platformy X11.
 Summary:	Qt5 X11 Extras - development files
 Summary(pl.UTF-8):	Biblioteka Qt5 X11 Extras - pliki programistyczne
 Group:		X11/Development/Libraries
-Requires:	OpenGL-devel
 Requires:	Qt5Core-devel >= %{qtbase_ver}
 Requires:	Qt5Gui-devel >= %{qtbase_ver}
 Requires:	Qt5X11Extras = %{version}-%{release}
@@ -82,9 +81,7 @@ Summary:	Qt5 X11 Extras documentation in HTML format
 Summary(pl.UTF-8):	Dokumentacja do biblioteki Qt5 X11 Extras w formacie HTML
 Group:		Documentation
 Requires:	qt5-doc-common >= %{qtbase_ver}
-%if "%{_rpmversion}" >= "5"
-BuildArch:	noarch
-%endif
+%{?noarchpackage}
 
 %description doc
 Qt5 X11 Extras documentation in HTML format.
@@ -97,9 +94,7 @@ Summary:	Qt5 X11 Extras documentation in QCH format
 Summary(pl.UTF-8):	Dokumentacja do biblioteki Qt5 X11 Extras w formacie QCH
 Group:		Documentation
 Requires:	qt5-doc-common >= %{qtbase_ver}
-%if "%{_rpmversion}" >= "5"
-BuildArch:	noarch
-%endif
+%{?noarchpackage}
 
 %description doc-qch
 Qt5 X11 Extras documentation in QCH format.
@@ -117,6 +112,7 @@ qmake-qt5
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtx11extras.git/commitdiff/4094a534a8fd51dbe33deab3adb1e8a6101429a2



More information about the pld-cvs-commit mailing list