From 43581d293612d416fb14bb5ea11594d567f7b477 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jun 26 2018 14:42:02 +0000 Subject: backport upstream FTBFS fix use %make_build, update %scriptlets --- diff --git a/0003-Fix-build-with-Qt-5.11-missing-QTabWidget.patch b/0003-Fix-build-with-Qt-5.11-missing-QTabWidget.patch new file mode 100644 index 0000000..68a53bc --- /dev/null +++ b/0003-Fix-build-with-Qt-5.11-missing-QTabWidget.patch @@ -0,0 +1,29 @@ +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 2c2f08f..ccaf8eb 100644 --- a/konversation.spec +++ b/konversation.spec @@ -1,7 +1,7 @@ Name: konversation Version: 1.7.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A user friendly IRC client License: GPLv2+ @@ -16,6 +16,7 @@ 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 @@ -71,7 +72,7 @@ pushd %{_target_platform} %{cmake_kf5} .. popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install @@ -102,6 +103,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.ko desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.konversation.desktop +%if 0%{?rhel} && 0%{?rhel} < 8 %post touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null ||: @@ -115,6 +117,7 @@ if [ $1 -eq 0 ] ; then gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null ||: update-desktop-database -q &> /dev/null ||: fi +%endif %files -f konversation.lang %doc ChangeLog README @@ -131,6 +134,10 @@ fi %changelog +* Tue Jun 26 2018 Rex Dieter - 1.7.4-4 +- backport upstream FTBFS fix +- use %%make_build, update %%scriptlets + * Mon Feb 12 2018 Rex Dieter - 1.7.4-3 - use %%_kf5_metainfodir