summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--contrib/redhat/openssh.spec8
2 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 605b94273..aece27756 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120010917
2 - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
3
120010916 420010916
2 - (djm) Workaround XFree breakage in RPM spec file 5 - (djm) Workaround XFree breakage in RPM spec file
3 - (bal) OpenBSD CVS Sync 6 - (bal) OpenBSD CVS Sync
@@ -6449,4 +6452,4 @@
6449 - Wrote replacements for strlcpy and mkdtemp 6452 - Wrote replacements for strlcpy and mkdtemp
6450 - Released 1.0pre1 6453 - Released 1.0pre1
6451 6454
6452$Id: ChangeLog,v 1.1522 2001/09/16 22:17:15 mouring Exp $ 6455$Id: ChangeLog,v 1.1523 2001/09/17 05:07:23 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index f67174fc1..d699ef327 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -2,7 +2,7 @@
2%define oversion 2.9p1 2%define oversion 2.9p1
3 3
4# Version of ssh-askpass 4# Version of ssh-askpass
5%define aversion 1.2.2 5%define aversion 1.2.4
6 6
7# Do we want to disable building of x11-askpass? (1=yes 0=no) 7# Do we want to disable building of x11-askpass? (1=yes 0=no)
8%define no_x11_askpass 0 8%define no_x11_askpass 0
@@ -153,11 +153,7 @@ make
153 153
154%if ! %{no_x11_askpass} 154%if ! %{no_x11_askpass}
155pushd x11-ssh-askpass-%{aversion} 155pushd x11-ssh-askpass-%{aversion}
156xmkmf 156xmkmf -a
157### Hacks to workaround XFree breakage
158perl -pi -e "s|distclean: |distclean:: |g" Makefile
159make SshAskpass_ad.h
160###
161make 157make
162popd 158popd
163%endif 159%endif