rpms/qt5-qtbase
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'f24' into epel7

Browse Source
This commit is contained in:
Rex Dieter 2016-08-02 08:16:22 -05:00
commit bcfd90ed1a
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qt5-qtbase.spec
View File

@ -30,6 +30,7 @@
%if 0%{?fedora} > 23 || 0%{?rhel} > 6 %if 0%{?fedora} > 23 || 0%{?rhel} > 6
%global journald -journald %global journald -journald
BuildRequires: perl-generators
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
%endif %endif
@ -56,7 +57,7 @@ BuildRequires: pkgconfig(libsystemd)
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Name: qt5-qtbase Name: qt5-qtbase
Version: 5.6.1 Version: 5.6.1
Release: 3%{?prerelease:.%{prerelease}}%{?dist} Release: 4%{?prerelease:.%{prerelease}}%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -136,8 +137,13 @@ Source10: macros.qt5
# RPM drag in gtk2 as a dependency for the GTK+ 2 dialog support. # RPM drag in gtk2 as a dependency for the GTK+ 2 dialog support.
%global __requires_exclude_from ^%{_qt5_plugindir}/platformthemes/.*$ %global __requires_exclude_from ^%{_qt5_plugindir}/platformthemes/.*$
# for %%check # for %%check, rpm auto-provides
BuildRequires: cmake %if 0%{?fedora}
BuildRequires: cmake >= 3
%endif
%if 0%{?rhel}
BuildRequires: cmake3
%endif
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: findutils BuildRequires: findutils
@ -342,6 +348,12 @@ Summary: RPM macros for Qt5
# https://bugzilla.redhat.com/show_bug.cgi?id=1248174 # https://bugzilla.redhat.com/show_bug.cgi?id=1248174
Requires: redhat-rpm-config Requires: redhat-rpm-config
%endif %endif
%if 0%{?fedora}
Requires: cmake >= 3
%endif
%if 0%{?rhel}
Requires: cmake3
%endif
# when qt5-rpm-macros was split out # when qt5-rpm-macros was split out
Conflicts: qt5-qtbase-devel < 5.6.0-0.23 Conflicts: qt5-qtbase-devel < 5.6.0-0.23
BuildArch: noarch BuildArch: noarch
@ -960,6 +972,9 @@ fi
%changelog %changelog
* Tue Aug 02 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-4
- qt5-rpm-macros: Requires: cmake(3)
* Tue Jun 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-3 * Tue Jun 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-3
- backport some xcb-plugin-related fixes - backport some xcb-plugin-related fixes