summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-04 21:09:24 +1100
committerDamien Miller <djm@mindrot.org>2010-03-04 21:09:24 +1100
commit661ffc1fd6d7c2d1f99ee0ab6918b10e53fe4f82 (patch)
tree68c680b0042078ba2be522d4477b5dadfdde681f
parent910f209c1d08b9b91f744c571fbf805206f04729 (diff)
- (djm) [contrib/redhat/openssh.spec] Replace obsolete BuildPreReq
on XFree86-devel with neutral /usr/include/X11/Xlib.h; imorgan AT nas.nasa.gov in bz#1731
-rw-r--r--ChangeLog3
-rw-r--r--contrib/redhat/openssh.spec2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c5398522b..1e82d21b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
120100304 120100304
2 - (djm) [ssh-keygen.c] Use correct local variable, instead of 2 - (djm) [ssh-keygen.c] Use correct local variable, instead of
3 maybe-undefined global "optarg" 3 maybe-undefined global "optarg"
4 - (djm) [contrib/redhat/openssh.spec] Replace obsolete BuildPreReq
5 on XFree86-devel with neutral /usr/include/X11/Xlib.h;
6 imorgan AT nas.nasa.gov in bz#1731
4 7
520100303 820100303
6 - (djm) [PROTOCOL.certkeys] Add RCS Ident 9 - (djm) [PROTOCOL.certkeys] Add RCS Ident
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index a15afc7ee..4bec90078 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -94,7 +94,7 @@ BuildPreReq: glibc-devel, pam
94BuildPreReq: /usr/include/security/pam_appl.h 94BuildPreReq: /usr/include/security/pam_appl.h
95%endif 95%endif
96%if ! %{no_x11_askpass} 96%if ! %{no_x11_askpass}
97BuildPreReq: XFree86-devel 97BuildPreReq: /usr/include/X11/Xlib.h
98%endif 98%endif
99%if ! %{no_gnome_askpass} 99%if ! %{no_gnome_askpass}
100BuildPreReq: pkgconfig 100BuildPreReq: pkgconfig