summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-11-13 23:13:55 +1100
committerDamien Miller <djm@mindrot.org>2000-11-13 23:13:55 +1100
commitee188d323c685e73d044e1acd0d20b43a355fc92 (patch)
treefd462609a541383c0cc5601ef6f7cb9001eaf12c /contrib
parentd1446d84c0f1201fd52cd970bf677a31685de78f (diff)
doh
Diffstat (limited to 'contrib')
-rw-r--r--contrib/redhat/openssh.spec9
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index a4567c1f..ad2c2a98 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -167,7 +167,6 @@ popd
%install
rm -rf $RPM_BUILD_ROOT
%{makeinstall} \
- sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/ssh \
libexecdir=$RPM_BUILD_ROOT%{_libexecdir}/openssh \
DESTDIR=/ # Hack to disable key generation
@@ -212,8 +211,8 @@ fi
%attr(0755,root,root) %{_bindir}/scp
%attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
%attr(0644,root,root) %{_mandir}/man1/scp.1*
-%attr(0755,root,root) %dir %{_sysconfdir}/ssh
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/primes
+%attr(0755,root,root) %dir %{_sysconfdir}
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/primes
%attr(0755,root,root) %dir %{_libexecdir}/openssh
%files clients
@@ -224,7 +223,7 @@ fi
%attr(0644,root,root) %{_mandir}/man1/ssh.1*
%attr(0644,root,root) %{_mandir}/man1/ssh-agent.1*
%attr(0644,root,root) %{_mandir}/man1/ssh-add.1*
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh_config
%attr(-,root,root) %{_bindir}/slogin
%attr(-,root,root) %{_mandir}/man1/slogin.1*
@@ -234,7 +233,7 @@ fi
%attr(0755,root,root) %{_libexecdir}/openssh/sftp-server
%attr(0644,root,root) %{_mandir}/man8/sshd.8*
%attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config
%attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd
%attr(0755,root,root) %config /etc/rc.d/init.d/sshd