Accepting request 89778 from home:pcerny:factory

- finalising libexecdir change (bnc#726712)

OBS-URL: https://build.opensuse.org/request/show/89778
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=15

openssh-askpass-gnome.spec

@@ -39,7 +39,6 @@ Patch6:         %{_name}-5.9p1-engines.diff
 Patch7:         %{_name}-5.9p1-blocksigalrm.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-
 %description
 SSH (Secure Shell) is a program for logging into a remote machine and
 for executing commands on a remote machine. This package contains a
@@ -56,7 +55,6 @@ GNOME-based passphrase dialog for OpenSSH.
 %patch6 -p1
 %patch7
 
-
 %build
 %{?suse_update_config:%{suse_update_config}}
 aclocal
@@ -75,17 +73,13 @@ cd contrib
 make %{?_smp_mflags} gnome-ssh-askpass2
 mv gnome-ssh-askpass2 gnome-ssh-askpass
 
-
 %install
 install -d -m 755 %{buildroot}%{_libexecdir}/ssh/
 install contrib/gnome-ssh-askpass %{buildroot}%{_libexecdir}/ssh/gnome-ssh-askpass
 
-
 %files
 %defattr(-,root,root)
 %dir %{_libexecdir}/ssh
 %attr(0755,root,root) %{_libexecdir}/ssh/gnome-ssh-askpass
 
-
-
 %changelog

openssh.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Oct 29 22:41:55 UTC 2011 - pcerny@suse.com
+
+- finalising libexecdir change (bnc#726712)
+
 -------------------------------------------------------------------
 Wed Oct 19 00:32:20 UTC 2011 - pcerny@suse.com
 

openssh.spec

@@ -65,7 +65,6 @@ Patch19:        %{name}-5.9p1-host_ident.diff
 Patch20:        converter-linking.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-
 %package        askpass
 License:        BSD3c(or similar) ; MIT License (or similar)
 Summary:        A passphrase dialog for OpenSSH and the X Window System
@@ -73,7 +72,6 @@ Requires:       openssh = %{version}
 Provides:       openssh:%{_libexecdir}/ssh/ssh-askpass
 Group:          Productivity/Networking/SSH
 
-
 %description
 SSH (Secure Shell) is a program for logging into and executing commands
 on a remote machine. It is intended to replace rsh (rlogin and rsh) and
@@ -113,7 +111,6 @@ cp -v %{SOURCE6} .
 cd ../x11-ssh-askpass-%{xversion}
 %patch1
 
-
 %build
 autoreconf -fiv
 %ifarch s390 s390x %sparc
@@ -152,7 +149,6 @@ xmkmf
 make includes USRLIBDIR=%{_libdir}
 make %{?_smp_mflags} USRLIBDIR=%{_libdir} CCOPTIONS="%{optflags}"
 
-
 %install
 make DESTDIR=%{buildroot}/ install
 install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d
@@ -167,38 +163,33 @@ install -d -m 755 %{buildroot}/var/adm/fillup-templates
 install -m 644 %{S:10} %{buildroot}/var/adm/fillup-templates
 # install shell script to automate the process of adding your public key to a remote machine
 install -m 755 contrib/ssh-copy-id %{buildroot}%{_bindir}
-install -m 644 contrib/ssh-copy-id.1 %{buildroot}/%{_mandir}/man1
+install -m 644 contrib/ssh-copy-id.1 %{buildroot}%{_mandir}/man1
-(cd converter; make install DESTDIR=%{buildroot}/)
+( cd converter; make install DESTDIR=%{buildroot} )
 cd ../x11-ssh-askpass-%{xversion}
 make BINDIR=%{_libexecdir}/ssh DESTDIR=%{buildroot} install install.man
-rm -rf %{buildroot}/%{_libexecdir}/ssh/ssh-askpass
+rm -rf %{buildroot}%{_libexecdir}/ssh/ssh-askpass
-sed -e "s@usr/lib/ssh@usr/%{_lib}/ssh@" < %{S:8} > %{buildroot}/%{_libexecdir}/ssh/ssh-askpass
+sed -e "s,@LIBEXEC@,%{_libexecdir},g" < %{S:8} > %{buildroot}%{_libexecdir}/ssh/ssh-askpass
 rm -f %{buildroot}%{_datadir}/Ssh.bin
 sed -i -e s@/usr/libexec@%{_libexecdir}@g %{buildroot}%{_sysconfdir}/ssh/sshd_config
 #install firewall definitions format is described here:
 #%{_datadir}/SuSEfirewall2/services/TEMPLATE
-mkdir -p %{buildroot}/%{_fwdefdir}
+mkdir -p %{buildroot}%{_fwdefdir}
-install -m 644 %{S:9} %{buildroot}/%{_fwdefdir}/sshd
+install -m 644 %{S:9} %{buildroot}%{_fwdefdir}/sshd
-
 
 %pre
 getent group sshd >/dev/null || %{_sbindir}/groupadd -o -r sshd
 getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d /var/lib/sshd -s /bin/false -c "SSH daemon" sshd
 
-
 %post
 %{fillup_and_insserv -n ssh sshd}
 
-
 %preun
 %stop_on_removal sshd
 
-
 %postun
 %restart_on_update sshd
 %{insserv_cleanup}
 
-
 %files
 %defattr(-,root,root)
 %dir %attr(755,root,root) /var/lib/sshd
@@ -236,7 +227,6 @@ getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d /var/lib/sshd
 /var/adm/fillup-templates/sysconfig.ssh
 %config %{_fwdefdir}/sshd
 
-
 %files askpass
 %defattr(-,root,root)
 %attr(0755,root,root) %{_libexecdir}/ssh/ssh-askpass
@@ -245,6 +235,4 @@ getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d /var/lib/sshd
 %doc %{_mandir}/man1/x11-ssh-askpass.1x.gz
 %{_appdefdir}/SshAskpass
 
-
-
 %changelog

ssh-askpass

@@ -24,9 +24,9 @@ if [ -z "$SESSION" ] ; then
   fi
 fi
 
-GNOME_SSH_ASKPASS="/usr/lib/ssh/gnome-ssh-askpass"
+GNOME_SSH_ASKPASS="@LIBEXEC@/ssh/gnome-ssh-askpass"
-KDE_SSH_ASKPASS="/usr/lib/ssh/ksshaskpass"
+KDE_SSH_ASKPASS="@LIBEXEC@/ssh/ksshaskpass"
-X11_SSH_ASKPASS="/usr/lib/ssh/x11-ssh-askpass"
+X11_SSH_ASKPASS="@LIBEXEC@/ssh/x11-ssh-askpass"
 
 case "$SESSION" in
   gnome)