From 92824fd7463690d034a4014740b9b059d972e4f8 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 9 Jun 2016 17:22:22 +0200 Subject: [PATCH 1/4] Update to 5.6.1 --- .gitignore | 1 + qt5-qttools.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 43b1ad3..956b1b3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /qttools-opensource-src-5.6.0-beta2.tar.xz /qttools-opensource-src-5.6.0-rc.tar.xz /qttools-opensource-src-5.6.0.tar.xz +/qttools-opensource-src-5.6.1.tar.xz diff --git a/qt5-qttools.spec b/qt5-qttools.spec index ac9d216..624fe65 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -16,8 +16,8 @@ Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.6.0 -Release: 3%{?prerelease:.%{prerelease}}%{?dist} +Version: 5.6.1 +Release: 1%{?prerelease:.%{prerelease}}%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -492,6 +492,9 @@ fi %changelog +* Thu Jun 09 2016 Jan Grulich - 5.6.1-1 +- Update to 5.6.1 + * Sun Mar 20 2016 Rex Dieter - 5.6.0-3 - rebuild diff --git a/sources b/sources index 8c4639a..2875e79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3168f5c9108d3577bc86a2ac02986c7c qttools-opensource-src-5.6.0.tar.xz +bf2cea01e94140524a3fc58c2f2ddebc qttools-opensource-src-5.6.1.tar.xz From 2c84a1b2fca70bd146e12f457cb8fdae915ea5ae Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 9 Jun 2016 13:20:50 -0500 Subject: [PATCH 2/4] drop extraneous pkgconfig-related build deps --- qt5-qttools.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 624fe65..ab1ce66 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -45,7 +45,6 @@ Source23: qdbusviewer.desktop BuildRequires: cmake %endif BuildRequires: desktop-file-utils -BuildRequires: pkgconfig(Qt5) >= %{version} ## optional (and deprecated), include in bootstrapping only for now %if ! 0%{?bootstrap} BuildRequires: pkgconfig(Qt5WebKit) From 02d49990071124604ffc7dd1003cb9649f3ea7d9 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 10 Jun 2016 10:43:52 +0200 Subject: [PATCH 3/4] BR: double-conversion-devel --- qt5-qttools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index ab1ce66..654f4dc 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -44,6 +44,7 @@ Source23: qdbusviewer.desktop %if 0%{?fedora} || 0%{?rhel} > 6 BuildRequires: cmake %endif +BuildRequires: double-conversion-devel BuildRequires: desktop-file-utils ## optional (and deprecated), include in bootstrapping only for now %if ! 0%{?bootstrap} From 45d7567add812a34d2e01652cc538309ddd9f174 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 10 Jun 2016 07:19:00 -0500 Subject: [PATCH 4/4] drop BR: double-conversion (fix qtdeclarative instead) --- qt5-qttools.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 654f4dc..6747d4a 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -17,7 +17,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.6.1 -Release: 1%{?prerelease:.%{prerelease}}%{?dist} +Release: 2%{?prerelease:.%{prerelease}}%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -44,7 +44,6 @@ Source23: qdbusviewer.desktop %if 0%{?fedora} || 0%{?rhel} > 6 BuildRequires: cmake %endif -BuildRequires: double-conversion-devel BuildRequires: desktop-file-utils ## optional (and deprecated), include in bootstrapping only for now %if ! 0%{?bootstrap} @@ -492,6 +491,9 @@ fi %changelog +* Fri Jun 10 2016 Rex Dieter - 5.6.1-2 +- drop BR: double-conversion (fix qtdeclarative instead) + * Thu Jun 09 2016 Jan Grulich - 5.6.1-1 - Update to 5.6.1