summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-09-16 17:13:45 +1000
committerDamien Miller <djm@mindrot.org>2001-09-16 17:13:45 +1000
commit0b9278e92315f35f1187d66e3267888bdc3c5bff (patch)
tree6bcdbdc0dd9b348a6b45a5493a8f187e3185774a
parent426d6bdc00c297b6e014a86648bffb922daa8b97 (diff)
- (djm) Workaround XFree breakage in RPM spec file
-rw-r--r--ChangeLog5
-rw-r--r--contrib/redhat/openssh.spec6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9cb4f838c..4f815ae41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120010916
2 - (djm) Workaround XFree breakage in RPM spec file
3
120010915 420010915
2 - (djm) Make do_pre_login static to avoid prototype #ifdef hell 5 - (djm) Make do_pre_login static to avoid prototype #ifdef hell
3 - (djm) Sync scard/ stuff 6 - (djm) Sync scard/ stuff
@@ -6441,4 +6444,4 @@
6441 - Wrote replacements for strlcpy and mkdtemp 6444 - Wrote replacements for strlcpy and mkdtemp
6442 - Released 1.0pre1 6445 - Released 1.0pre1
6443 6446
6444$Id: ChangeLog,v 1.1520 2001/09/16 07:13:11 djm Exp $ 6447$Id: ChangeLog,v 1.1521 2001/09/16 07:13:45 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 20e9bf4da..f67174fc1 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -153,7 +153,11 @@ make
153 153
154%if ! %{no_x11_askpass} 154%if ! %{no_x11_askpass}
155pushd x11-ssh-askpass-%{aversion} 155pushd x11-ssh-askpass-%{aversion}
156xmkmf -a 156xmkmf
157### Hacks to workaround XFree breakage
158perl -pi -e "s|distclean: |distclean:: |g" Makefile
159make SshAskpass_ad.h
160###
157make 161make
158popd 162popd
159%endif 163%endif