Compare commits
25 Commits
Author | SHA1 | Date |
---|---|---|
|
3129595fb5 | |
|
c3879d9ba5 | |
|
6f02e4cf78 | |
|
d5e2722528 | |
|
fce775b147 | |
|
a5215285b1 | |
|
b836824741 | |
|
1279d84496 | |
|
eaa699287b | |
|
02cfad9669 | |
|
a1b2c5d042 | |
|
9602a89e4a | |
|
e49be6fa4d | |
|
25c3a28907 | |
|
889d9cbd71 | |
|
01f6a19d1a | |
|
d218a6e292 | |
|
c097bae150 | |
|
b4a0c6ebbe | |
|
04661b7de7 | |
|
f1a8d41bb2 | |
|
73aff94c60 | |
|
9f91c6fd2e | |
|
1c75053c8f | |
|
21748c29f1 |
|
@ -57,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
|
||||||
|
@ -137,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
|
||||||
|
@ -343,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
|
||||||
|
@ -961,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
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue