From 75d85cd6b377d7df2406d265b4159d6970d1f0e0b3cded8ac9815d136b8f589a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 23 Aug 2012 08:42:59 +0000 Subject: [PATCH] Accepting request 131396 from home:bmwiedemann:branches:X11:common:Factory Fix generic su (bnc#776202) note: the XSU variable is never used in the script and we dont have any xsu in 12.2 anyway so it uses xterm+su OBS-URL: https://build.opensuse.org/request/show/131396 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=20 --- xdg-su-generic.diff | 13 +++++++++++++ xdg-utils.changes | 5 +++++ xdg-utils.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 xdg-su-generic.diff diff --git a/xdg-su-generic.diff b/xdg-su-generic.diff new file mode 100644 index 0000000..d2d27e8 --- /dev/null +++ b/xdg-su-generic.diff @@ -0,0 +1,13 @@ +Index: xdg-utils-20120310/scripts/xdg-su.in +=================================================================== +--- xdg-utils-20120310.orig/scripts/xdg-su.in ++++ xdg-utils-20120310/scripts/xdg-su.in +@@ -145,7 +145,7 @@ fi + detectDE + + if [ x"$DE" = x"" ]; then +- XSU=`which xsu 2>/dev/null` ++ XSU=`which xterm 2>/dev/null` + if [ $? -eq 0 ] ; then + DE=generic + fi diff --git a/xdg-utils.changes b/xdg-utils.changes index 54ca896..61fe055 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 23 08:30:11 UTC 2012 - bwiedemann@suse.com + +- Fix generic su (bnc#776202) + ------------------------------------------------------------------- Fri Jun 29 00:27:04 CEST 2012 - jslaby@suse.de diff --git a/xdg-utils.spec b/xdg-utils.spec index a29726c..179541c 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -34,6 +34,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: xdg-utils-%{version}.tar.xz Patch0: install-some-more-scripts.diff Patch1: xfce-su.diff +Patch2: xdg-su-generic.diff Patch8: xdg-screensaver-gnome-perl.diff Requires: perl Requires: perl-Net-DBus @@ -60,6 +61,7 @@ these utilities work properly in their environment. %setup -q -n %name-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch8 -p1 %build