From a93648f11ab14013c28e1418a1478c79972f23475cef1dcde8100481a06da5fd Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sat, 22 Sep 2007 21:43:29 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/xdg-utils?expand=0&rev=4

---
 xdg-su.diff       | 162 +---------------------------------------------
 xdg-utils.changes |   5 ++
 xdg-utils.spec    |   9 +--
 3 files changed, 12 insertions(+), 164 deletions(-)

diff --git a/xdg-su.diff b/xdg-su.diff
index d403cb9..a024b7c 100644
--- a/xdg-su.diff
+++ b/xdg-su.diff
@@ -710,166 +710,8 @@
 +detectDE
 +
 +if [ x"$DE" = x"" ]; then
-+    XSU=`which xsu 2>/dev/null`
-+    if [ $? -eq 0 ] ; then
-+        DE=generic
-+    fi
-+fi
-+
-+case "$DE" in
-+    kde)
-+    su_kde
-+    ;;
-+
-+    gnome)
-+    su_gnome
-+    ;;
-+
-+    generic)
-+    su_generic
-+    ;;
-+
-+    *)
-+    [ x"$user" = x"" ] && user=root 
-+    exit_failure_operation_impossible "no graphical method available for invoking '$cmd' as '$user'"
-+    ;;
-+esac
---- scripts/xdg-su.in
-+++ scripts/xdg-su.in
-@@ -0,0 +1,155 @@
-+#!/bin/sh
-+#---------------------------------------------
-+#   xdg-su
-+#
-+#   Utility script to run a command as an alternate user, generally
-+#       the root user, with a graphical prompt for the root
-+#       password if needed
-+#
-+#   Refer to the usage() function below for usage.
-+#
-+#   Copyright 2006, Jeremy White <jwhite@codeweavers.com>
-+#   Copyright 2006, Kevin Krammer <kevin.krammer@gmx.at>
-+#
-+#   LICENSE:
-+#
-+#---------------------------------------------
-+
-+manualpage()
-+{
-+cat << _MANUALPAGE
-+_MANUALPAGE
-+}
-+
-+usage()
-+{
-+cat << _USAGE
-+_USAGE
-+}
-+
-+#@xdg-utils-common@
-+
-+su_kde()
-+{
-+    KDESU=`which kdesu 2>/dev/null`
-+    if [ $? -eq 0 ] ; then
-+        if [ -z "$user" ] ; then
-+             $KDESU -c "$cmd"
-+        else
-+             $KDESU -u "$user" -c "$cmd"
-+        fi
-+
-+        if [ $? -eq 0 ]; then
-+            exit_success
-+        else
-+            exit_failure_operation_failed
-+        fi
-+    else
-+        su_generic
-+    fi
-+}
-+
-+su_gnome()
-+{
-+    GSU=`which gnomesu 2>/dev/null`
-+    if [ $? -ne 0 ] ; then
-+        GSU=`which xsu 2>/dev/null`
-+    fi
-+    if [ $? -eq 0 ] ; then
-+        if [ -z "$user" ] ; then
-+            $GSU -c "$cmd"
-+        else
-+            $GSU -u "$user" -c "$cmd"
-+        fi
-+
-+        if [ $? -eq 0 ]; then
-+            exit_success
-+        else
-+            exit_failure_operation_failed
-+        fi
-+    else
-+        su_generic
-+    fi
-+}
-+
-+su_generic()
-+{
-+    if [ -z "$user" ] ; then
-+        xterm -geom 60x5 -T "xdg-su: $cmd" -e su -c "$cmd"
-+    else
-+        xterm -geom 60x5 -T "xdg-su: $cmd" -e su -u "$user" -c "$cmd"
-+    fi
-+
-+    if [ $? -eq 0 ]; then
-+        exit_success
-+    else
-+        exit_failure_operation_failed
-+    fi
-+}
-+
-+[ x"$1" != x"" ] || exit_failure_syntax
-+
-+user=
-+cmd=
-+while [ $# -gt 0 ] ; do
-+    parm="$1"
-+    shift
-+
-+    case "$parm" in
-+      -u)
-+        if [ -z "$1" ] ; then
-+            exit_failure_syntax "user argument missing for -u"
-+        fi
-+        user="$1"
-+        shift
-+        ;;
-+
-+      -c)
-+        if [ -z "$1" ] ; then
-+            exit_failure_syntax "command argument missing for -c"
-+        fi
-+        cmd="$1"
-+        shift
-+        ;;
-+
-+      -*)
-+        exit_failure_syntax "unexpected option '$parm'"
-+        ;;
-+
-+      *)
-+        exit_failure_syntax "unexpected argument '$parm'"
-+        ;;
-+    esac
-+done
-+
-+if [ -z "${cmd}" ] ; then
-+    exit_failure_syntax "command missing"
-+fi
-+
-+detectDE
-+
-+if [ x"$DE" = x"" ]; then
-+    XSU=`which xsu 2>/dev/null`
-+    if [ $? -eq 0 ] ; then
++    which xterm 2>/dev/null >&2
++    if [ $? -eq 0 -a -n "$DISPLAY" ] ; then
 +        DE=generic
 +    fi
 +fi
diff --git a/xdg-utils.changes b/xdg-utils.changes
index af0d2e3..42bf59f 100644
--- a/xdg-utils.changes
+++ b/xdg-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 20 18:57:34 CEST 2007 - dmueller@suse.de
+
+- fix xdg-su outside KDE/GNOME (#309164) 
+
 -------------------------------------------------------------------
 Thu Aug 30 11:35:02 CEST 2007 - dmueller@suse.de
 
diff --git a/xdg-utils.spec b/xdg-utils.spec
index edcbb1f..a883c1d 100644
--- a/xdg-utils.spec
+++ b/xdg-utils.spec
@@ -16,9 +16,9 @@ License:        X11/MIT
 Group:          System/GUI/Other
 Summary:        Utilities to uniformly interface desktop environments
 Version:        1.0.1
-Release:        74
-BuildArch:    noarch
-URL:            http://portland.freedesktop.org/
+Release:        84
+BuildArch:      noarch
+Url:            http://portland.freedesktop.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %name-%{version}.tar.bz2
 Patch0:         xdg-su.diff
@@ -80,8 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xdg-open.1.gz
 %{_mandir}/man1/xdg-su.1.gz
 %{_mandir}/man1/xdg-screensaver.1.gz
-
 %changelog
+* Thu Sep 20 2007 - dmueller@suse.de
+- fix xdg-su outside KDE/GNOME (#309164)
 * Thu Aug 30 2007 - dmueller@suse.de
 - fix xdg-su for XFCE (#304753)
 * Tue May 22 2007 - dmueller@suse.de