From 525c30006d481cdbc7c3c6cf1d2cbbedcb2d29c2e043b28688549a2df266c3e9 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 27 Jul 2017 05:10:28 +0000 Subject: [PATCH] Accepting request 512680 from home:wolfi323:branches:KDE:Applications - Add Don-t-suggest-to-install-libburn.patch to not suggest to the user to install libburn on startup. The message is actually misleading as k3b would actually use cdrskin which is packaged separately in openSUSE. But let's stick to prefer the proven cdrecord for now, people can still install cdrskin if they'd prefer to use it. (boo#1050715) OBS-URL: https://build.opensuse.org/request/show/512680 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=28 --- Don-t-suggest-to-install-libburn.patch | 35 ++++++++++++++++++++++++++ k3b.changes | 10 ++++++++ k3b.spec | 3 +++ 3 files changed, 48 insertions(+) create mode 100644 Don-t-suggest-to-install-libburn.patch diff --git a/Don-t-suggest-to-install-libburn.patch b/Don-t-suggest-to-install-libburn.patch new file mode 100644 index 0000000..423b9a0 --- /dev/null +++ b/Don-t-suggest-to-install-libburn.patch @@ -0,0 +1,35 @@ +From 8cf4e9d0da6fd3ad794928faad8619aa66c3ddd3 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer +Date: Wed, 26 Jul 2017 17:34:21 +0200 +Subject: [PATCH] Don't suggest to install libburn + +The message is actually misleading because k3b uses cdrskin which is +packaged separately to libburn in openSUSE. + +Let's stick to prefer cdrecord for now. +People who want to use cdrskin instead can still install it. +(boo#1050715) +--- + src/k3bsystemproblemdialog.cpp | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp +index 126ad3120..9897903e0 100644 +--- a/src/k3bsystemproblemdialog.cpp ++++ b/src/k3bsystemproblemdialog.cpp +@@ -288,12 +288,6 @@ void K3b::SystemProblemDialog::checkSystem( QWidget* parent, NotificationLevel l + #endif + } + +- if (!k3bcore->externalBinManager()->foundBin("cdrskin")) { +- problems.append(K3b::SystemProblem(K3b::SystemProblem::CRITICAL, +- i18n("Unable to find %1 executable", QString("cdrskin")), +- i18n("K3b uses cdrskin in place of cdrecord."), +- i18n("Install the libburn package which contains cdrskin"))); +- } + } + + +-- +2.13.1 + diff --git a/k3b.changes b/k3b.changes index 260cf5f..3d29e3f 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jul 26 15:41:52 UTC 2017 - wbauer@tmo.at + +- Add Don-t-suggest-to-install-libburn.patch to not suggest to the + user to install libburn on startup. The message is actually + misleading as k3b would actually use cdrskin which is packaged + separately in openSUSE. But let's stick to prefer the proven + cdrecord for now, people can still install cdrskin if they'd + prefer to use it. (boo#1050715) + ------------------------------------------------------------------- Sat Jul 15 22:59:06 CEST 2017 - lbeltrame@kde.org diff --git a/k3b.spec b/k3b.spec index f2cbe20..4b3a704 100644 --- a/k3b.spec +++ b/k3b.spec @@ -32,6 +32,8 @@ Url: http://www.kde.org Source: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE Patch: Re-enable-transcode-support.patch +# PATCH-FIX-OPENSUSE +Patch1: Don-t-suggest-to-install-libburn.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -119,6 +121,7 @@ This package contain files needed for development with k3b. %prep %setup -q %patch -p1 +%patch1 -p1 %build CXXFLAGS="%{optflags} -fno-strict-aliasing"