summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-09-19 16:58:21 +1000
committerDamien Miller <djm@mindrot.org>2003-09-19 16:58:21 +1000
commit968c8d25e9201e4b75b56951df9082af5ed0499a (patch)
tree8a7754768b653efdd84ae073cce5ed9ebc8b03fb
parentf09ad861e62978d4f6d77453977d7b58d63caf07 (diff)
- (djm) Bug #641: Allow RedHat RPM building without GTK-2; Patch from
jason AT devrandom.org
-rw-r--r--ChangeLog4
-rw-r--r--contrib/redhat/openssh.spec5
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b77f881ca..33318e460 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
3 djast AT cs.toronto.edu 3 djast AT cs.toronto.edu
4 - (djm) Bug #661: Remove duplicate check for basename; from 4 - (djm) Bug #661: Remove duplicate check for basename; from
5 bugzilla-openssh AT thewrittenword.com 5 bugzilla-openssh AT thewrittenword.com
6 - (djm) Bug #641: Allow RedHat RPM building without GTK-2; Patch from
7 jason AT devrandom.org
6 8
720030918 920030918
8 - (djm) Bug #652: Fix empty password auth 10 - (djm) Bug #652: Fix empty password auth
@@ -1124,4 +1126,4 @@
1124 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1126 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1125 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1127 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1126 1128
1127$Id: ChangeLog,v 1.3003 2003/09/19 06:41:01 djm Exp $ 1129$Id: ChangeLog,v 1.3004 2003/09/19 06:58:21 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index b65f37839..9c75c0339 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -34,6 +34,11 @@
34%{?skip_x11_askpass:%define no_x11_askpass 1} 34%{?skip_x11_askpass:%define no_x11_askpass 1}
35%{?skip_gnome_askpass:%define no_gnome_askpass 1} 35%{?skip_gnome_askpass:%define no_gnome_askpass 1}
36 36
37# Add option to build without GTK2 for older platforms with only GTK+.
38# RedHat <= 7.2 and Red Hat Advanced Server 2.1 are examples.
39# rpm -ba|--rebuild --define 'no_gtk2 1'
40%{?no_gtk2:%define gtk2 0}
41
37# Is this a build for RHL 6.x or earlier? 42# Is this a build for RHL 6.x or earlier?
38%{?build_6x:%define build6x 1} 43%{?build_6x:%define build6x 1}
39 44