- support for modular xorg

- rel. 3

Changed files:
    openssh.spec -> 1.246

diff --git a/openssh.spec b/openssh.spec
index 4667f111e16cf9114c6cfcb10664e8e32579beca..bc255213b70e451eb8711f403ed7c9092726bdf9 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,7 +1,4 @@
 #
-# todo:
-# - for modularized xorg use /usr/bin/xauth
-#
 # Conditional build:
 %bcond_without chroot          # without chrooted user environment support
 %bcond_with    gnome           # with gnome-askpass (GNOME 1.x) utility
@@ -31,8 +28,8 @@ Summary(ru):  OpenSSH - 
 Summary(uk):   OpenSSH - צÌØÎÁ ÒÅÁ̦ÚÁÃ¦Ñ ÐÒÏÔÏËÏÌÕ Secure Shell (SSH)
 Name:          openssh
 Version:       4.3p1
-Release:       2%{?with_hpn:hpn}%{?with_hpn_none:hpn_none}
-Epoch:         2
+Release:       3%{?with_hpn:hpn}%{?with_hpn_none:hpn_none}
+Epoch:         3
 License:       BSD
 Group:         Applications/Networking
 Source0:       ftp://ftp.ca.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
@@ -488,7 +485,7 @@ cp %{_datadir}/automake/config.sub .
        %{?with_kerberos5:--with-kerberos5} \
        --with-privsep-path=%{_privsepdir} \
        --with-pid-dir=%{_localstatedir}/run \
-       --with-xauth=/usr/X11R6/bin/xauth
+       --with-xauth=/usr/bin/xauth
 
 echo '#define LOGIN_PROGRAM           "/bin/login"' >>config.h