From 7385d7e1a19975d54c4f953e98399763b617bd0450ab0fe957c0081d15e78b69 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 20 Feb 2012 15:20:42 +0000
Subject: [PATCH] Accepting request 105960 from home:msmeissn:branches:network

fix build with new x11

OBS-URL: https://build.opensuse.org/request/show/105960
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=21
---
 openssh-askpass-gnome.spec | 6 ++++--
 openssh.changes            | 5 +++++
 openssh.spec               | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec
index e8738de..c651c48 100644
--- a/openssh-askpass-gnome.spec
+++ b/openssh-askpass-gnome.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openssh-askpass-gnome
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           openssh-askpass-gnome
 BuildRequires:  gtk2-devel
 BuildRequires:  krb5-devel
@@ -25,7 +26,8 @@ BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
 Version:        5.9p1
 Release:        0
-Requires:       openssh = %{version} openssh-askpass = %{version}
+Requires:       openssh = %{version}
+Requires:       openssh-askpass = %{version}
 Summary:        A GNOME-Based Passphrase Dialog for OpenSSH
 License:        BSD-3-Clause
 Group:          Productivity/Networking/SSH
diff --git a/openssh.changes b/openssh.changes
index 0b1430f..91e625f 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 20 08:29:17 UTC 2012 - meissner@suse.com
+
+- include X11 app default dir
+
 -------------------------------------------------------------------
 Fri Dec 23 08:27:08 UTC 2011 - brian@aljex.com
 
diff --git a/openssh.spec b/openssh.spec
index c37b15b..6482726 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openssh
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -270,6 +270,7 @@ getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d /var/lib/sshd
 %attr(0755,root,root) %{_libexecdir}/ssh/x11-ssh-askpass
 %doc %{_mandir}/man1/ssh-askpass.1x.gz
 %doc %{_mandir}/man1/x11-ssh-askpass.1x.gz
+%dir %{_appdefdir}
 %{_appdefdir}/SshAskpass
 
 %changelog