[kde-runtime] improve installdbgsymbols script

[Rex Dieter]

commit 4a216156af1eab1f30f3acc41237175b2aebfb33
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Aug 7 20:03:18 2012 -0500

    improve installdbgsymbols script

 kde-runtime-4.9.0-installdbgsymbols.patch |   27 +++++++++++++++++++++++++++
 kde-runtime.spec                          |   12 +++++++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/kde-runtime-4.9.0-installdbgsymbols.patch b/kde-runtime-4.9.0-installdbgsymbols.patch
new file mode 100644
index 0000000..f648de5
--- /dev/null
+++ b/kde-runtime-4.9.0-installdbgsymbols.patch
@@ -0,0 +1,27 @@
+diff -up kde-runtime-4.9.0/drkonqi/doc/examples/installdbgsymbols_fedora.sh.installdbgsymbols kde-runtime-4.9.0/drkonqi/doc/examples/installdbgsymbols_fedora.sh
+--- kde-runtime-4.9.0/drkonqi/doc/examples/installdbgsymbols_fedora.sh.installdbgsymbols	2012-05-22 18:57:38.000000000 -0500
++++ kde-runtime-4.9.0/drkonqi/doc/examples/installdbgsymbols_fedora.sh	2012-08-07 20:00:11.506028183 -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
+ 
+@@ -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 debuginfo-install $packages"
+ 
+ if [ "$?" = "1" ]; then
+     exit 3
diff --git a/kde-runtime.spec b/kde-runtime.spec
index 41fe874..78fbeea 100644
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@ -7,7 +7,7 @@
 Name:    kde-runtime
 Summary: KDE Runtime
 Version: 4.9.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+ and GPLv2+
@@ -41,6 +41,10 @@ Patch9: kdebase-runtime-4.3.4-man-overrides.patch
 # make nepomuk menu items (with oxygen-only icons atm) OnlyShowIn=KDE;
 Patch50: kde-runtime-4.7.90-nepomuk_onlyshowin_kde.patch
 
+# make installdbgsymbols.sh use pkexec instead of su 
+# increase some timeouts in an effort to see (some) errors before close
+Patch51: kde-runtime-4.9.0-installdbgsymbols.patch
+
 ## upstream patches
 
 # rhel patches
@@ -70,6 +74,8 @@ Requires: %{name}-flags = %{version}-%{release}
 # KHelpcenter requires htdig for building search indices
 Requires: htdig
 Requires: nepomuk-core >= %{version}
+# patch51 uses pkexec
+Requires: polkit
 # Nepomuk requires pdftotext for indexing PDFs
 Requires: poppler-utils
 
@@ -154,6 +160,7 @@ BuildArch: noarch
 %patch8 -p1 -b .config
 %patch9 -p1 -b .man-overrides
 %patch50 -p1 -b .nepomuk_onlyshowin_kde
+%patch51 -p1 -b .installdgbsymbols
 
 %if 0%{?rhel}
 %patch300 -p1 -b .webkit
@@ -327,6 +334,9 @@ fi
 
 
 %changelog
+* Tue Aug 07 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.0-4
+- improve installdbgsymbols script
+
 * Sat Aug 04 2012 Than Ngo <than at redhat.com> - 4.9.0-3
 - update webkit patch