diff options
Diffstat (limited to 'contrib/redhat')
-rw-r--r-- | contrib/redhat/openssh.spec | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 810af1500..37316d21e 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -167,8 +167,8 @@ This package contains the GNOME passphrase dialog. | |||
167 | 167 | ||
168 | %build | 168 | %build |
169 | 169 | ||
170 | %configure --sysconfdir=/etc/ssh --with-tcp-wrappers \ | 170 | %configure --sysconfdir=/etc/ssh --libexecdir=/usr/libexec/openssh \ |
171 | --with-rsh=/usr/bin/rsh | 171 | --with-tcp-wrappers --with-rsh=/usr/bin/rsh |
172 | 172 | ||
173 | make | 173 | make |
174 | 174 | ||
@@ -193,17 +193,17 @@ make install DESTDIR=$RPM_BUILD_ROOT/ | |||
193 | 193 | ||
194 | install -d $RPM_BUILD_ROOT/etc/pam.d/ | 194 | install -d $RPM_BUILD_ROOT/etc/pam.d/ |
195 | install -d $RPM_BUILD_ROOT/etc/rc.d/init.d | 195 | install -d $RPM_BUILD_ROOT/etc/rc.d/init.d |
196 | install -d $RPM_BUILD_ROOT/usr/libexec/ssh | 196 | install -d $RPM_BUILD_ROOT/usr/libexec/openssh |
197 | install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd | 197 | install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd |
198 | install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd | 198 | install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd |
199 | 199 | ||
200 | %if ! %{no_x11_askpass} | 200 | %if ! %{no_x11_askpass} |
201 | install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/x11-ssh-askpass | 201 | install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/x11-ssh-askpass |
202 | ln -s /usr/libexec/ssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass | 202 | ln -s /usr/libexec/openssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/ssh-askpass |
203 | %endif | 203 | %endif |
204 | 204 | ||
205 | %if ! %{no_gnome_askpass} | 205 | %if ! %{no_gnome_askpass} |
206 | install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/gnome-ssh-askpass | 206 | install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/gnome-ssh-askpass |
207 | %endif | 207 | %endif |
208 | 208 | ||
209 | %clean | 209 | %clean |
@@ -230,7 +230,7 @@ fi | |||
230 | %attr(0644,root,root) /usr/man/man1/ssh-keygen.1* | 230 | %attr(0644,root,root) /usr/man/man1/ssh-keygen.1* |
231 | %attr(0644,root,root) /usr/man/man1/scp.1* | 231 | %attr(0644,root,root) /usr/man/man1/scp.1* |
232 | %attr(0755,root,root) %dir /etc/ssh | 232 | %attr(0755,root,root) %dir /etc/ssh |
233 | %attr(0755,root,root) %dir /usr/libexec/ssh | 233 | %attr(0755,root,root) %dir /usr/libexec/openssh |
234 | 234 | ||
235 | %files clients | 235 | %files clients |
236 | %defattr(-,root,root) | 236 | %defattr(-,root,root) |
@@ -258,12 +258,12 @@ fi | |||
258 | %doc x11-ssh-askpass-%{aversion}/README | 258 | %doc x11-ssh-askpass-%{aversion}/README |
259 | %doc x11-ssh-askpass-%{aversion}/ChangeLog | 259 | %doc x11-ssh-askpass-%{aversion}/ChangeLog |
260 | %doc x11-ssh-askpass-%{aversion}/SshAskpass*.ad | 260 | %doc x11-ssh-askpass-%{aversion}/SshAskpass*.ad |
261 | %attr(0755,root,root) /usr/libexec/ssh/ssh-askpass | 261 | %attr(0755,root,root) /usr/libexec/openssh/ssh-askpass |
262 | %attr(0755,root,root) /usr/libexec/ssh/x11-ssh-askpass | 262 | %attr(0755,root,root) /usr/libexec/openssh/x11-ssh-askpass |
263 | %endif | 263 | %endif |
264 | 264 | ||
265 | %if ! %{no_gnome_askpass} | 265 | %if ! %{no_gnome_askpass} |
266 | %files askpass-gnome | 266 | %files askpass-gnome |
267 | %defattr(-,root,root) | 267 | %defattr(-,root,root) |
268 | %attr(0755,root,root) /usr/libexec/ssh/gnome-ssh-askpass | 268 | %attr(0755,root,root) /usr/libexec/openssh/gnome-ssh-askpass |
269 | %endif | 269 | %endif |