[openssh/f16] compile ssh-askpass with corect CFLAGS

[Tomáš Mráz]

commit 083417c440ecd13fd2db764cc741d9b51ffaea20
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Fri Nov 18 09:57:39 2011 +0100

    compile ssh-askpass with corect CFLAGS
    
    Conflicts:
    
    	openssh.spec

 openssh-5.8p2-askpass-ld.patch |   18 ++++++++++++++++++
 openssh.spec                   |    8 +++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/openssh-5.8p2-askpass-ld.patch b/openssh-5.8p2-askpass-ld.patch
new file mode 100644
index 0000000..5b85c80
--- /dev/null
+++ b/openssh-5.8p2-askpass-ld.patch
@@ -0,0 +1,18 @@
+diff -up openssh-5.8p2/contrib/Makefile.askpass-ld openssh-5.8p2/contrib/Makefile
+--- openssh-5.8p2/contrib/Makefile.askpass-ld	2011-08-08 22:54:06.050546199 +0200
++++ openssh-5.8p2/contrib/Makefile	2011-08-08 22:54:43.364420118 +0200
+@@ -2,12 +2,12 @@ all:
+ 	@echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2"
+ 
+ gnome-ssh-askpass1: gnome-ssh-askpass1.c
+-	$(CC) `gnome-config --cflags gnome gnomeui` \
++	$(CC) ${CFLAGS} `gnome-config --cflags gnome gnomeui` \
+ 		gnome-ssh-askpass1.c -o gnome-ssh-askpass1 \
+ 		`gnome-config --libs gnome gnomeui`
+ 
+ gnome-ssh-askpass2: gnome-ssh-askpass2.c
+-	$(CC) `pkg-config --cflags gtk+-2.0` \
++	$(CC) ${CFLAGS} `pkg-config --cflags gtk+-2.0` \
+ 		gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
+ 		`pkg-config --libs gtk+-2.0 x11`
+ 
diff --git a/openssh.spec b/openssh.spec
index 2872393..a86313c 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -79,7 +79,7 @@
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %define openssh_ver 5.8p2
-%define openssh_rel 17
+%define openssh_rel 19
 %define pam_ssh_agent_ver 0.9.2
 %define pam_ssh_agent_rel 31
 
@@ -194,6 +194,8 @@ Patch65: openssh-5.8p2-remove-stale-control-socket.patch
 Patch66: openssh-5.8p2-ipv6man.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1919
 Patch67: openssh-5.8p2-unconfined.patch
+#?
+Patch69: openssh-5.8p2-askpass-ld.patch
 #---
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1604
 # sctp
@@ -431,6 +433,7 @@ popd
 %patch65 -p1 -b .remove_stale
 %patch66 -p1 -b .ipv6man
 %patch67 -p1 -b .unconfined
+%patch69 -p1 -b .askpass-ld
 
 autoreconf
 pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
@@ -768,6 +771,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug  8 2011 Jan F. Chadima <jchadima at redhat.com> - 5.8p2-19 + 0.9.2-31
+- compile ssh-askpass with corect CFLAGS
+
 * Mon Aug  8 2011 Jan F. Chadima <jchadima at redhat.com> - 5.8p2-17 + 0.9.2-31
 - repair broken man pages