From 85c7d6e0b859e57087699acac1316a24d862737d2c458bd59fc35f7975e87489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 23 Aug 2012 14:34:09 +0000
Subject: [PATCH] - update to snapshot from 20120809   * fix xdg-su for icewm
 (bnc#776202)   * remove xfce-su.diff (merged)   * few fixes (syntax errors in
 some cases and such)   * see ChangeLog for updates

OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=21
---
 xdg-su-generic.diff       | 13 -------------
 xdg-utils-20120310.tar.xz |  3 ---
 xdg-utils-20120809.tar.xz |  3 +++
 xdg-utils.changes         |  8 ++++++--
 xdg-utils.spec            | 12 +++---------
 xfce-su.diff              | 34 ----------------------------------
 6 files changed, 12 insertions(+), 61 deletions(-)
 delete mode 100644 xdg-su-generic.diff
 delete mode 100644 xdg-utils-20120310.tar.xz
 create mode 100644 xdg-utils-20120809.tar.xz
 delete mode 100644 xfce-su.diff

diff --git a/xdg-su-generic.diff b/xdg-su-generic.diff
deleted file mode 100644
index d2d27e8..0000000
--- a/xdg-su-generic.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-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-20120310.tar.xz b/xdg-utils-20120310.tar.xz
deleted file mode 100644
index 778d361..0000000
--- a/xdg-utils-20120310.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:974f500adc492db1a45f647c4ca44ee9e5d315376b74521c1fd7a82b9f79ca6b
-size 271840
diff --git a/xdg-utils-20120809.tar.xz b/xdg-utils-20120809.tar.xz
new file mode 100644
index 0000000..07978ba
--- /dev/null
+++ b/xdg-utils-20120809.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e25e9b356b6f58f6dd7e4d1148bf04d7292dd0d0ed54b6be4c257ac24d83d84
+size 272160
diff --git a/xdg-utils.changes b/xdg-utils.changes
index 61fe055..13a8707 100644
--- a/xdg-utils.changes
+++ b/xdg-utils.changes
@@ -1,7 +1,11 @@
 -------------------------------------------------------------------
-Thu Aug 23 08:30:11 UTC 2012 - bwiedemann@suse.com
+Mon Aug 20 16:18:37 CEST 2012 - jslaby@suse.de
 
-- Fix generic su (bnc#776202)
+- update to snapshot from 20120809
+  * fix xdg-su for icewm (bnc#776202)
+  * remove xfce-su.diff (merged)
+  * few fixes (syntax errors in some cases and such)
+  * see ChangeLog for updates
 
 -------------------------------------------------------------------
 Fri Jun 29 00:27:04 CEST 2012 - jslaby@suse.de
diff --git a/xdg-utils.spec b/xdg-utils.spec
index 179541c..dd0b617 100644
--- a/xdg-utils.spec
+++ b/xdg-utils.spec
@@ -25,7 +25,7 @@ BuildRequires:  w3m
 Summary:        Utilities to uniformly interface desktop environments
 License:        MIT
 Group:          System/GUI/Other
-Version:        20120310
+Version:        20120809
 Release:        0
 BuildArch:      noarch
 Url:            http://portland.freedesktop.org/
@@ -33,8 +33,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # http://portland.freedesktop.org/download/xdg-utils-%%{version}.tgz
 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
@@ -55,19 +53,15 @@ If a desktop developer wants to be certain that their environment
 functions with all third party software, then can simply make sure that
 these utilities work properly in their environment.
 
-
-
 %prep
 %setup -q -n %name-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 %patch8 -p1
 
 %build
 %configure
-(cd scripts; make scripts)
-make %{?_smp_flags}
+(cd scripts; touch *.in; make %{?_smp_mflags} scripts)
+make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
diff --git a/xfce-su.diff b/xfce-su.diff
deleted file mode 100644
index 3ed2e43..0000000
--- a/xfce-su.diff
+++ /dev/null
@@ -1,34 +0,0 @@
----
- scripts/xdg-su.in |   14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/scripts/xdg-su.in
-+++ b/scripts/xdg-su.in
-@@ -93,6 +93,16 @@ su_generic()
-     fi
- }
- 
-+
-+su_xfce()
-+{
-+    if which gnomesu &>/dev/null ; then
-+        su_gnome
-+    else
-+        su_generic
-+    fi
-+}
-+
- [ x"$1" != x"" ] || exit_failure_syntax
- 
- user=
-@@ -154,6 +164,10 @@ case "$DE" in
-     su_generic
-     ;;
- 
-+    xfce)
-+    su_xfce
-+    ;;
-+
-     *)
-     [ x"$user" = x"" ] && user=root
-     exit_failure_operation_impossible "no graphical method available for invoking '$cmd' as '$user'"