diff options
author | Damien Miller <djm@mindrot.org> | 2000-03-15 12:31:18 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-03-15 12:31:18 +1100 |
commit | ddaffa4194d7a25bdaae9c38aa2dadf5712ea3f5 (patch) | |
tree | 7b3abdecb928a7ce625f810d7c3471d9b3e5a507 /contrib | |
parent | 256fdcbec5ee70e69a89e47a360b6091a904f1a6 (diff) | |
download | openssh-git-ddaffa4194d7a25bdaae9c38aa2dadf5712ea3f5.tar.gz |
Updated spec file for new version and locations
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/redhat/openssh.spec | 20 | ||||
-rw-r--r-- | contrib/suse/openssh.spec | 16 |
2 files changed, 28 insertions, 8 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index ad483540..4d3cf528 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,5 +1,5 @@ # Version of OpenSSH -%define oversion 1.2.3pre2 +%define oversion 1.2.3pre3 # Version of ssh-askpass %define aversion 0.99 @@ -118,6 +118,9 @@ patented algorithms to seperate libraries (OpenSSL). This package contains the GNOME passphrase dialog. %changelog +* Wed Mar 15 2000 Damien Miller <djm@ibs.com.au> +- Updated for new location +- Updated for new gnome-ssh-askpass build * Sun Dec 26 1999 Damien Miller <djm@mindrot.org> - Added Jim Knoble's <jmknoble@pobox.com> askpass * Mon Nov 15 1999 Damien Miller <djm@mindrot.org> @@ -148,8 +151,7 @@ This package contains the GNOME passphrase dialog. CFLAGS="$RPM_OPT_FLAGS" \ ./configure --prefix=/usr --sysconfdir=/etc/ssh \ - --with-gnome-askpass --with-tcp-wrappers \ - --with-ipv4-default + --with-tcp-wrappers --with-ipv4-default make @@ -158,18 +160,26 @@ xmkmf -a make cd .. +cd contrib +gcc -Og `gnome-config --cflags gnome gnomeui` \ + gnome-ssh-askpass.c -o gnome-ssh-askpass \ + `gnome-config --libs gnome gnomeui` +cd .. + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT/ install -d $RPM_BUILD_ROOT/etc/pam.d/ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d -install -m644 packages/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd -install -m755 packages/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd +install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd +install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd install -s x11-ssh-askpass-%{aversion}/ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/x11-ssh-askpass ln -s /usr/libexec/ssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass +install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/gnome-ssh-askpass + %clean rm -rf $RPM_BUILD_ROOT diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index ab16c40b..9588173e 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec @@ -1,6 +1,6 @@ Summary: OpenSSH, a free Secure Shell (SSH) implementation Name: openssh -Version: 1.2.3pre2 +Version: 1.2.3pre3 Release: 1 Source0: openssh-%{version}.tar.gz Copyright: BSD @@ -99,6 +99,9 @@ patented algorithms to seperate libraries (OpenSSL). This package contains the GNOME passphrase dialog. %changelog +* Wed Mar 15 2000 Damien Miller <djm@ibs.com.au> +- Updated for new location +- Updated for new gnome-ssh-askpass build * Sun Dec 26 1999 Chris Saia <csaia@wtower.com> - Made symlink to gnome-ssh-askpass called ssh-askpass * Wed Nov 24 1999 Chris Saia <csaia@wtower.com> @@ -148,6 +151,12 @@ CFLAGS="$RPM_OPT_FLAGS" \ --with-tcp-wrappers --with-ipv4-default make +cd contrib +gcc -Og `gnome-config --cflags gnome gnomeui` \ + gnome-ssh-askpass.c -o gnome-ssh-askpass \ + `gnome-config --libs gnome gnomeui` +cd .. + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT/ @@ -156,10 +165,11 @@ install -d $RPM_BUILD_ROOT/etc/pam.d/ install -d $RPM_BUILD_ROOT/sbin/init.d/ install -d $RPM_BUILD_ROOT/var/adm/fillup-templates install -m644 sshd.pam.generic $RPM_BUILD_ROOT/etc/pam.d/sshd -install -m744 packages/suse/rc.sshd $RPM_BUILD_ROOT/sbin/init.d/sshd +install -m744 contrib/suse/rc.sshd $RPM_BUILD_ROOT/sbin/init.d/sshd ln -s ../../sbin/init.d/sshd $RPM_BUILD_ROOT/usr/sbin/rcsshd +install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/gnome-ssh-askpass ln -s gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass -install -m744 packages/suse/rc.config.sshd \ +install -m744 contrib/suse/rc.config.sshd \ $RPM_BUILD_ROOT/var/adm/fillup-templates %clean |