diff --git a/plasma-workspace-5.6.4-installdbgsymbols.patch b/plasma-workspace-5.6.4-installdbgsymbols.patch new file mode 100644 index 0000000..cb9e9ec --- /dev/null +++ b/plasma-workspace-5.6.4-installdbgsymbols.patch @@ -0,0 +1,36 @@ +diff -up plasma-workspace-5.6.4/drkonqi/doc/examples/installdbgsymbols_fedora.sh.installdbgsymbols plasma-workspace-5.6.4/drkonqi/doc/examples/installdbgsymbols_fedora.sh +--- plasma-workspace-5.6.4/drkonqi/doc/examples/installdbgsymbols_fedora.sh.installdbgsymbols 2016-05-10 11:53:10.000000000 -0500 ++++ plasma-workspace-5.6.4/drkonqi/doc/examples/installdbgsymbols_fedora.sh 2016-06-05 08:28:19.980649266 -0500 +@@ -27,12 +27,12 @@ run_in_terminal() + mkfifo $fifo + + # start terminal +- konsole -e sh -c "echo \$\$ > $fifo; $1; exit_status=\$?; sleep 1; rm $fifo; echo \$exit_status > $fifo" & ++ konsole -e sh -c "echo \$\$ > $fifo; set -x ; $1; exit_status=\$?; sleep 10; rm $fifo; echo \$exit_status > $fifo" & + + # wait for it to finish + local pid=`cat $fifo` + while [ "$?" = "0" ]; do +- sleep 1 ++ sleep 10 + kill -0 $pid 2>/dev/null + done + +@@ -65,7 +65,7 @@ check_dep() + fi + } + +-check_dep debuginfo-install ++#check_dep debuginfo-install + check_dep konsole + + # start searching for packages +@@ -80,7 +80,7 @@ done + # filter out duplicates + packages=`echo "$packages" | tr " " "\n" | sort | uniq | tr "\n" " "` + +-run_in_terminal "su -c \"debuginfo-install $packages\"" ++run_in_terminal "pkexec dnf debuginfo-install $packages" + + if [ "$?" = "1" ]; then + exit 3 diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 41ed2bb..a461591 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -7,7 +7,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.6.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://quickgit.kde.org/?p=%{name}.git @@ -37,7 +37,10 @@ Patch12: startkde.patch Patch13: startplasmacompositor.patch ## upstreamable Patches +# (yum) debuginfo-install improvements Patch1: kde-runtime-4.9.0-installdbgsymbols.patch +# dnf debuginfo-install +Patch2: plasma-workspace-5.6.4-installdbgsymbols.patch ## upstream Patches Patch101: 0001-Don-t-read-empty-icons-from-config-stored-launcher-U.patch @@ -314,6 +317,13 @@ Summary: DrKonqi crash handler for KF5/Plasma5 Obsoletes: plasma-workspace < 5.4.2-2 Requires: %{name} = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} +%if 0%{?fedora} > 23 +Requires: dnf-command(debuginfo-install) +%else +# owner of debuginfo-install +Requires: yum-utils +%endif +Requires: konsole5 Requires: polkit # owner of setsebool Requires(post): policycoreutils @@ -379,7 +389,13 @@ Requires: f24-kde-theme %patch103 -p1 %patch104 -p1 +%if 0%{?fedora} > 23 +# dnf debuginfo-install +%patch2 -p1 -b .installdgbsymbols +%else +# (yum) debuginfo-install %patch1 -p1 -b .installdbgsymbols +%endif %patch10 -p1 -b .konsole-in-contextmenu %if 0%{?default_lookandfeel:1} %patch11 -p1 -b .set-fedora-default-look-and-feel @@ -618,6 +634,10 @@ fi %changelog +* Sun Jun 05 2016 Rex Dieter - 5.6.4-3 +- -drkonqi: support 'dnf debuginfo-install' (f24+) +- -drkonqi: Requires: konsole5 dnf-command(debuginfo-install) (f24+) + * Thu May 26 2016 Rex Dieter - 5.6.4-2 - backport 5.6 branch fixes