Merge branch 'master' into epel7
This commit is contained in:
commit
ebb3f3e1e3
1
.gitignore
vendored
1
.gitignore
vendored
@ -10,3 +10,4 @@
|
|||||||
/qttools-opensource-src-5.6.0-beta2.tar.xz
|
/qttools-opensource-src-5.6.0-beta2.tar.xz
|
||||||
/qttools-opensource-src-5.6.0-rc.tar.xz
|
/qttools-opensource-src-5.6.0-rc.tar.xz
|
||||||
/qttools-opensource-src-5.6.0.tar.xz
|
/qttools-opensource-src-5.6.0.tar.xz
|
||||||
|
/qttools-opensource-src-5.6.1.tar.xz
|
||||||
|
@ -16,8 +16,8 @@
|
|||||||
|
|
||||||
Summary: Qt5 - QtTool components
|
Summary: Qt5 - QtTool components
|
||||||
Name: qt5-qttools
|
Name: qt5-qttools
|
||||||
Version: 5.6.0
|
Version: 5.6.1
|
||||||
Release: 3%{?prerelease:.%{prerelease}}%{?dist}
|
Release: 2%{?prerelease:.%{prerelease}}%{?dist}
|
||||||
|
|
||||||
License: LGPLv3 or LGPLv2
|
License: LGPLv3 or LGPLv2
|
||||||
Url: http://www.qt.io
|
Url: http://www.qt.io
|
||||||
@ -45,7 +45,6 @@ Source23: qdbusviewer.desktop
|
|||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: pkgconfig(Qt5) >= %{version}
|
|
||||||
## optional (and deprecated), include in bootstrapping only for now
|
## optional (and deprecated), include in bootstrapping only for now
|
||||||
%if ! 0%{?bootstrap}
|
%if ! 0%{?bootstrap}
|
||||||
BuildRequires: pkgconfig(Qt5WebKit)
|
BuildRequires: pkgconfig(Qt5WebKit)
|
||||||
@ -492,6 +491,12 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 10 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-2
|
||||||
|
- drop BR: double-conversion (fix qtdeclarative instead)
|
||||||
|
|
||||||
|
* Thu Jun 09 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-1
|
||||||
|
- Update to 5.6.1
|
||||||
|
|
||||||
* Sun Mar 20 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-3
|
* Sun Mar 20 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-3
|
||||||
- rebuild
|
- rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user