summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-09-17 15:07:23 +1000
committerDamien Miller <djm@mindrot.org>2001-09-17 15:07:23 +1000
commit01ebad06db96f791706ea6c760fc921b141483ea (patch)
tree06fc6f90ff50f5179c95157346249e1bff342537
parent37e41c90198e4cb3c69f9faa2e0d64f580c10219 (diff)
- (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
-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 605b9427..aece2775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20010917
+ - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
+
20010916
- (djm) Workaround XFree breakage in RPM spec file
- (bal) OpenBSD CVS Sync
@@ -6449,4 +6452,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1522 2001/09/16 22:17:15 mouring Exp $
+$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 f67174fc..d699ef32 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -2,7 +2,7 @@
%define oversion 2.9p1
# Version of ssh-askpass
-%define aversion 1.2.2
+%define aversion 1.2.4
# Do we want to disable building of x11-askpass? (1=yes 0=no)
%define no_x11_askpass 0
@@ -153,11 +153,7 @@ make
%if ! %{no_x11_askpass}
pushd x11-ssh-askpass-%{aversion}
-xmkmf
-### Hacks to workaround XFree breakage
-perl -pi -e "s|distclean: |distclean:: |g" Makefile
-make SshAskpass_ad.h
-###
+xmkmf -a
make
popd
%endif