Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[packaging] Improve spec file. Contributes to JB#50383
+ Add licence files with %license
+ Fix License tag
+ Remove deprecated Group tag

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
  • Loading branch information
Thaodan committed Dec 18, 2020
1 parent 5b718b9 commit f9a337d
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions rpm/qtbase.spec
Expand Up @@ -15,8 +15,7 @@ Name: qt5
Summary: Cross-platform application and UI framework
Version: 5.6.3
Release: 1%{?dist}
Group: Qt/Qt
License: LGPLv2.1 with exception or GPLv3
License: LGPLv2 with exception or LGPLv3 or GPLv3 or Qt Commercial
URL: https://www.qt.io/
Source0: %{name}-%{version}.tar.bz2
Source1: macros.qt5-default
Expand Down Expand Up @@ -415,7 +414,6 @@ applications that use QtConcurrent

%package -n qt5-default
Summary: Qt5 development defaults packafge
Group: Development/Libraries
Requires: qtchooser
Provides: qt-default
Conflicts: qt4-default
Expand Down Expand Up @@ -602,6 +600,7 @@ ln -s %{_sysconfdir}/xdg/qtchooser/5.conf %{buildroot}%{_sysconfdir}/xdg/qtchoos

%files qtcore
%defattr(-,root,root,-)
%license LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.GPLv3
%dir %{_includedir}/qt5/
%dir %{_datadir}/qt5/
%dir %{_libdir}/qt5/
Expand Down

0 comments on commit f9a337d

Please sign in to comment.