rpms/qt5
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fix rpm-macros for RHEL builds

Browse Source
This commit is contained in:
Troy Dawson 2020-08-19 20:43:34 +00:00
parent 097ae318f4
commit 0658ed3bcb
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qt5.spec
View File

@ -1,4 +1,3 @@
# include qt5,qt5-devel metapackages or not # include qt5,qt5-devel metapackages or not
# dropped for f32+ # dropped for f32+
%if 0%{?fedora} < 32 %if 0%{?fedora} < 32
@ -82,7 +81,12 @@ Requires: qt5-qtxmlpatterns-devel
%package rpm-macros %package rpm-macros
Summary: RPM macros for building Qt5 and KDE Frameworks 5 packages Summary: RPM macros for building Qt5 and KDE Frameworks 5 packages
Conflicts: qt5-qtbase-devel < 5.6.0-0.23 Conflicts: qt5-qtbase-devel < 5.6.0-0.23
%if 0%{?fedora} || 0%{?rhel} >= 8
Requires: cmake >= 3 Requires: cmake >= 3
%endif
%if 0%{?rhel} && 0%{?rhel} < 8
Requires: cmake3
%endif
Requires: gcc-c++ Requires: gcc-c++
%description rpm-macros %description rpm-macros
%{summary}. %{summary}.
@ -138,7 +142,7 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README
%changelog %changelog
* Wed Aug 19 2020 Troy Dawson <tdawson@redhat.com> - 5.14.2-5 * Wed Aug 19 2020 Troy Dawson <tdawson@redhat.com> - 5.14.2-5
- rpm-macros always requires cmake - fix rpm-macros for RHEL builds
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-4 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild