diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..774f9ea --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/drkonqi-5.11.0.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index bc8ae59..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# plasma-drkonqi - -The plasma-drkonqi package \ No newline at end of file diff --git a/drkonqi-installdbgsymbols.patch b/drkonqi-installdbgsymbols.patch new file mode 100644 index 0000000..7773188 --- /dev/null +++ b/drkonqi-installdbgsymbols.patch @@ -0,0 +1,37 @@ +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-drkonqi.spec b/plasma-drkonqi.spec new file mode 100644 index 0000000..c5bdd56 --- /dev/null +++ b/plasma-drkonqi.spec @@ -0,0 +1,100 @@ +%global base_name drkonqi + +Name: plasma-drkonqi +Summary: DrKonqi crash handler for KF5/Plasma5 +Version: 5.11.0 +Release: 1%{?dist} + +License: GPLv2+ +URL: https://cgit.kde.org/%{base_name}.git + +%global revision %(echo %{version} | cut -d. -f3) +%if %{revision} >= 50 +%global stable unstable +%else +%global stable stable +%endif +Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{base_name}-%{version}.tar.xz + +## upstreamable Patches +# dnf debuginfo-install +Patch52: drkonqi-installdbgsymbols.patch + +BuildRequires: extra-cmake-modules +BuildRequires: kf5-rpm-macros +BuildRequires: qt5-qtbase-devel + +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5Notifications) +BuildRequires: cmake(KF5Service) +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5JobWidgets) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Crash) +BuildRequires: cmake(KF5XmlRpcClient) +BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(KF5IdleTime) +BuildRequires: cmake(Qt5X11Extras) + +# retired from plasma-workspace +Obsoletes: plasma-workspace-drkonqi < 5.10.95 +Provides: plasma-workspace-drkonqi = %{version}-%{release} + +Requires: dnf-command(debuginfo-install) +Requires: konsole5 +Requires: polkit +# owner of setsebool +Requires(post): policycoreutils + +%description +%{summary} + + +%prep +%setup -q -n %{base_name}-%{version} + +%patch52 -p1 -b .installdgbsymbols + +%build +mkdir %{_target_platform} +pushd %{_target_platform} +%{cmake_kf5} .. +popd + +make %{?_smp_mflags} -C %{_target_platform} + +%install +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +# installdbgsymbols script +install -p -D -m755 src/doc/examples/installdbgsymbols_fedora.sh \ + %{buildroot}%{_libexecdir}/installdbgsymbols.sh + +%find_lang all --with-html --with-qt --all-name +grep drkonqi5.mo all.lang > plasma-drkonqi.lang + +%post +# make DrKonqi work by default by taming SELinux enough (suggested by dwalsh) +# if KDE_DEBUG is set, DrKonqi is disabled, so do nothing +# if it is unset (or empty), check if deny_ptrace is already disabled +# if not, disable it +if [ -z "$KDE_DEBUG" ] ; then +if [ "`getsebool deny_ptrace 2>/dev/null`" == 'deny_ptrace --> on' ] ; then + setsebool -P deny_ptrace off &> /dev/null || : +fi +fi + +%files -f plasma-drkonqi.lang +%license COPYING +%{_libexecdir}/drkonqi +%{_libexecdir}/installdbgsymbols.sh +%{_kf5_datadir}/drkonqi/ + +%changelog +* Wed Oct 11 2017 Martin Kyral - 5.11.0-0.1 +- 5.11.0 + +* Thu Sep 14 2017 Martin Kyral - 5.10.95-1 +- 5.10.95 +(split from plasma-workspace) + diff --git a/sources b/sources new file mode 100644 index 0000000..0dc9ee0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (drkonqi-5.11.0.tar.xz) = 91ce947f17d8ed25845aedfd9f88dfcad1879b3b42be3f3a8268e13035c2516b635d7abd05d9b216e45b4e0a61b708c0458f9cc99dd84e70dd3cf1833c4a46bd