2 files changed, 27 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b417871b5..b7af8dd8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
  - (djm) Merge openssh-TODO.patch from Redhat (null) beta
  - (djm) Add gnome-ssh-askpass2.c (gtk2) by merge with patch from 
     Nalin Dahyabhai <nalin@redhat.com>
+ - (djm) Add support for building gtk2 password requestor from Redhat beta
 
 20020903
  - (djm) Patch from itojun@ for Darwin OS: test getaddrinfo, reorder libcrypt
@@ -1607,4 +1608,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2447 2002/09/05 06:46:24 djm Exp $
+$Id: ChangeLog,v 1.2448 2002/09/05 06:53:20 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index e4bef55a0..14be171f8 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -20,6 +20,9 @@
 # Do we want smartcard support (1=yes 0=no)
 %define scard 0
 
+# Use GTK2 instead of GNOME in gnome-ssh-askpass
+%define gtk2 0
+
 # Is this build for RHL 6.x?
 %define build6x 0
 
@@ -220,6 +223,28 @@ make
 popd
 %endif
 
+# Define a variable to toggle gnome1/gtk2 building.  This is necessary
+# because RPM doesn't handle nested %if statements.
+%if %{gtk2}
+        gtk2=yes
+%else
+        gtk2=no
+%endif
+
+%if ! %{no_gnome_askpass}
+pushd contrib
+if [ $gtk2 = yes ] ; then
+        gcc $RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0` \
+            gnome-ssh-askpass2.c -o gnome-ssh-askpass \
+            `pkg-config --libs gtk+-2.0`
+else
+        gcc $RPM_OPT_FLAGS `gnome-config --cflags gnome gnomeui` \
+            gnome-ssh-askpass1.c -o gnome-ssh-askpass \
+            `gnome-config --libs gnome gnomeui`
+fi
+popd
+%endif
+
 %if ! %{no_gnome_askpass}
 pushd contrib
 gcc $RPM_OPT_FLAGS `gnome-config --cflags gnome gnomeui` \