summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-09-05 16:53:20 +1000
committerDamien Miller <djm@mindrot.org>2002-09-05 16:53:20 +1000
commit005d4560ed000be8a667f876967348a99a7a8897 (patch)
tree289d816a02c57f3a153beb39513c36866a19c5e3
parent44d5b60336e2233813083e254a9ca751b7f3c172 (diff)
- (djm) Add support for building gtk2 password requestor from Redhat beta
-rw-r--r--ChangeLog3
-rw-r--r--contrib/redhat/openssh.spec25
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 @@
7 - (djm) Merge openssh-TODO.patch from Redhat (null) beta 7 - (djm) Merge openssh-TODO.patch from Redhat (null) beta
8 - (djm) Add gnome-ssh-askpass2.c (gtk2) by merge with patch from 8 - (djm) Add gnome-ssh-askpass2.c (gtk2) by merge with patch from
9 Nalin Dahyabhai <nalin@redhat.com> 9 Nalin Dahyabhai <nalin@redhat.com>
10 - (djm) Add support for building gtk2 password requestor from Redhat beta
10 11
1120020903 1220020903
12 - (djm) Patch from itojun@ for Darwin OS: test getaddrinfo, reorder libcrypt 13 - (djm) Patch from itojun@ for Darwin OS: test getaddrinfo, reorder libcrypt
@@ -1607,4 +1608,4 @@
1607 - (stevesk) entropy.c: typo in debug message 1608 - (stevesk) entropy.c: typo in debug message
1608 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1609 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1609 1610
1610$Id: ChangeLog,v 1.2447 2002/09/05 06:46:24 djm Exp $ 1611$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 @@
20# Do we want smartcard support (1=yes 0=no) 20# Do we want smartcard support (1=yes 0=no)
21%define scard 0 21%define scard 0
22 22
23# Use GTK2 instead of GNOME in gnome-ssh-askpass
24%define gtk2 0
25
23# Is this build for RHL 6.x? 26# Is this build for RHL 6.x?
24%define build6x 0 27%define build6x 0
25 28
@@ -220,6 +223,28 @@ make
220popd 223popd
221%endif 224%endif
222 225
226# Define a variable to toggle gnome1/gtk2 building. This is necessary
227# because RPM doesn't handle nested %if statements.
228%if %{gtk2}
229 gtk2=yes
230%else
231 gtk2=no
232%endif
233
234%if ! %{no_gnome_askpass}
235pushd contrib
236if [ $gtk2 = yes ] ; then
237 gcc $RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0` \
238 gnome-ssh-askpass2.c -o gnome-ssh-askpass \
239 `pkg-config --libs gtk+-2.0`
240else
241 gcc $RPM_OPT_FLAGS `gnome-config --cflags gnome gnomeui` \
242 gnome-ssh-askpass1.c -o gnome-ssh-askpass \
243 `gnome-config --libs gnome gnomeui`
244fi
245popd
246%endif
247
223%if ! %{no_gnome_askpass} 248%if ! %{no_gnome_askpass}
224pushd contrib 249pushd contrib
225gcc $RPM_OPT_FLAGS `gnome-config --cflags gnome gnomeui` \ 250gcc $RPM_OPT_FLAGS `gnome-config --cflags gnome gnomeui` \