diff --git a/.gitignore b/.gitignore index 04b7ed2..10887e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /konversation-1.7.4.tar.xz +/konversation-1.7.5.tar.xz diff --git a/0003-Fix-build-with-Qt-5.11-missing-QTabWidget.patch b/0003-Fix-build-with-Qt-5.11-missing-QTabWidget.patch deleted file mode 100644 index 68a53bc..0000000 --- a/0003-Fix-build-with-Qt-5.11-missing-QTabWidget.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 20018b3d0798421c9cb8a9d983e5a5b34bd88e8d Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Mon, 19 Mar 2018 17:13:30 +0100 -Subject: [PATCH 3/5] Fix build with Qt 5.11 (missing QTabWidget) - -Reviewers: #konversation, hein - -Reviewed By: #konversation, hein - -Differential Revision: https://phabricator.kde.org/D11490 ---- - src/dcc/transferdetailedinfopanel.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dcc/transferdetailedinfopanel.h b/src/dcc/transferdetailedinfopanel.h -index e8debbc0..0e7391de 100644 ---- a/src/dcc/transferdetailedinfopanel.h -+++ b/src/dcc/transferdetailedinfopanel.h -@@ -16,6 +16,7 @@ - #include "ui_transferdetailedinfopanelui.h" - #include "ui_transferdetailedtimeinfopanelui.h" - -+#include - - class QTimer; - --- -2.17.1 - diff --git a/konversation.spec b/konversation.spec index ccaf8eb..b779dad 100644 --- a/konversation.spec +++ b/konversation.spec @@ -1,7 +1,7 @@ Name: konversation -Version: 1.7.4 -Release: 4%{?dist} +Version: 1.7.5 +Release: 1%{?dist} Summary: A user friendly IRC client License: GPLv2+ @@ -16,7 +16,6 @@ Source0: http://download.kde.org/%{?beta:un}stable/konversation/%{version Source1: konversationrc ## upstream patches -Patch3: 0003-Fix-build-with-Qt-5.11-missing-QTabWidget.patch BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules @@ -134,6 +133,9 @@ fi %changelog +* Sat Jun 30 2018 Rex Dieter - 1.7.5-1 +- konversation-1.7.5 + * Tue Jun 26 2018 Rex Dieter - 1.7.4-4 - backport upstream FTBFS fix - use %%make_build, update %%scriptlets diff --git a/sources b/sources index 8ec6ba6..0036943 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (konversation-1.7.4.tar.xz) = 8d30fc0c0e533f1fa3268f8360eb5b9321b505fca3103ce189f707247345b2b2c409f590ce45d6fb129a76fc642a4e9f6a802c244a0a3e56aded422ddf4ed19a +SHA512 (konversation-1.7.5.tar.xz) = 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504