From dd7e6123ebe138cc0292da8bf0c253348516d420af19bbf4912eab23f5c60e4a Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Sun, 4 Dec 2016 01:58:08 +0000
Subject: [PATCH 1/2] start with 5.29.0

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdesu?expand=0&rev=108
---
 kdesu-5.28.0.tar.xz | 3 ---
 kdesu-5.29.0.tar.xz | 3 +++
 kdesu.changes       | 7 +++++++
 kdesu.spec          | 7 ++-----
 4 files changed, 12 insertions(+), 8 deletions(-)
 delete mode 100644 kdesu-5.28.0.tar.xz
 create mode 100644 kdesu-5.29.0.tar.xz

diff --git a/kdesu-5.28.0.tar.xz b/kdesu-5.28.0.tar.xz
deleted file mode 100644
index 87f854b..0000000
--- a/kdesu-5.28.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:976f0054ed5fb4a51e0462cc0dde0249d6f1c15ad1e76047889a048dede2cab8
-size 44520
diff --git a/kdesu-5.29.0.tar.xz b/kdesu-5.29.0.tar.xz
new file mode 100644
index 0000000..46646f5
--- /dev/null
+++ b/kdesu-5.29.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:854cce99c3cac9ca28fd3f7c74b39b7af9d88f63b82c021398819888b4767dd2
+size 44624
diff --git a/kdesu.changes b/kdesu.changes
index 1cfd49a..2b6bcb3 100644
--- a/kdesu.changes
+++ b/kdesu.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Dec  4 01:58:05 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Update to 5.29.0
+  * For more details please see:
+    https://www.kde.org/announcements/kde-frameworks-5.29.0.php
+
 -------------------------------------------------------------------
 Thu Nov 10 12:55:50 UTC 2016 - alarrosa@suse.com
 
diff --git a/kdesu.spec b/kdesu.spec
index 67e6e79..ae2db14 100644
--- a/kdesu.spec
+++ b/kdesu.spec
@@ -18,9 +18,9 @@
 
 %bcond_without lang
 %define lname   libKF5Su5
-%define _tar_path 5.28
+%define _tar_path 5.29
 Name:           kdesu
-Version:        5.28.0
+Version:        5.29.0
 Release:        0
 %define kf5_version %{version}
 BuildRequires:  cmake >= 2.8.12
@@ -41,8 +41,6 @@ Source:         http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%
 Source1:        baselibs.conf
 # PATCH-FIX-OPENSUSE fpie.patch -- make kdesud compile/link with -(f)pie flags
 Patch0:         fpie.patch
-# PATCH-FIX-UPSTREAM unset-xdg-runtime-dir.diff alarrosa@suse.com -- unset XDG_RUNTIME_DIR so applications run under kdesu don't try to use an inaccesible runtime dir
-Patch1:         unset-xdg-runtime-dir.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -82,7 +80,6 @@ Development files.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
   %cmake_kf5 -d build

From c577f1963df130827c0cadb2493e9ade95a44be995eb3c6aa8a21d7184ce3cfe Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Wed, 14 Dec 2016 22:10:29 +0000
Subject: [PATCH 2/2] changelogs

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdesu?expand=0&rev=109
---
 kdesu.changes              |  2 ++
 unset-xdg-runtime-dir.diff | 13 -------------
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 unset-xdg-runtime-dir.diff

diff --git a/kdesu.changes b/kdesu.changes
index 2b6bcb3..e38f723 100644
--- a/kdesu.changes
+++ b/kdesu.changes
@@ -2,8 +2,10 @@
 Sun Dec  4 01:58:05 UTC 2016 - hrvoje.senjan@gmail.com
 
 - Update to 5.29.0
+  * Unsets XDG_RUNTIME_DIR in processes run with kdesu
   * For more details please see:
     https://www.kde.org/announcements/kde-frameworks-5.29.0.php
+- Drop upstreamed unset-xdg-runtime-dir.diff
 
 -------------------------------------------------------------------
 Thu Nov 10 12:55:50 UTC 2016 - alarrosa@suse.com
diff --git a/unset-xdg-runtime-dir.diff b/unset-xdg-runtime-dir.diff
deleted file mode 100644
index 5551a3b..0000000
--- a/unset-xdg-runtime-dir.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kdesu-5.26.0/src/kdesu_stub.c
-===================================================================
---- kdesu-5.26.0.orig/src/kdesu_stub.c
-+++ kdesu-5.26.0/src/kdesu_stub.c
-@@ -258,6 +258,8 @@ int main()
-         unsetenv("LC_ALL");
-     }
- 
-+    unsetenv("XDG_RUNTIME_DIR");
-+
-     /* Do we need to change uid? */
- 
-     pw = getpwnam(params[P_USER].value);