Hello community, here is the log from the commit of package openssh checked in at Sun Aug 6 21:57:14 CEST 2006. -------- --- openssh/openssh.changes 2006-07-21 17:22:11.000000000 +0200 +++ openssh/openssh.changes 2006-08-03 15:08:06.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 3 15:07:41 CEST 2006 - postadal@suse.cz + +- fixed build with X11R7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssh-askpass-gnome.spec ++++++ --- /var/tmp/diff_new_pack.AAkp06/_old 2006-08-06 21:57:02.000000000 +0200 +++ /var/tmp/diff_new_pack.AAkp06/_new 2006-08-06 21:57:02.000000000 +0200 @@ -15,7 +15,7 @@ License: Other License(s), see package Group: Productivity/Networking/SSH Version: 4.3p2 -Release: 2 +Release: 3 Requires: openssh = %{version} openssh-askpass = %{version} Autoreqprov: on Summary: A GNOME-Based Passphrase Dialog for OpenSSH @@ -102,7 +102,6 @@ mv gnome-ssh-askpass2 gnome-ssh-askpass %install -rm -rf $RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT/usr/%_lib/ssh/ install contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/%_lib/ssh/gnome-ssh-askpass ++++++ openssh.spec ++++++ --- /var/tmp/diff_new_pack.AAkp06/_old 2006-08-06 21:57:02.000000000 +0200 +++ /var/tmp/diff_new_pack.AAkp06/_new 2006-08-06 21:57:02.000000000 +0200 @@ -11,6 +11,13 @@ # norootforbuild Name: openssh +%define _prefix %(xft-config --prefix) +%if "%{_prefix}" == "/usr/X11R6" +%define _mandir %{_prefix}/man +%define _appdefdir %{_prefix}/lib/X11/app-defaults +%else +%define _appdefdir %{_prefix}/share/X11/app-defaults +%endif BuildRequires: krb5-devel opensc-devel openssl-devel pam-devel tcpd-devel xorg-x11-devel License: Other License(s), see package, X11/MIT Group: Productivity/Networking/SSH @@ -21,7 +28,7 @@ Conflicts: nonfreessh Autoreqprov: on Version: 4.3p2 -Release: 2 +Release: 3 %define xversion 1.2.4.1 Summary: Secure Shell Client and Server (Remote Login Program) URL: http://www.openssh.com/ @@ -142,6 +149,11 @@ %patch12 %build +%if "%{_prefix}" != "/usr/X11R6" + for i in configure.ac Makefile.in pathnames.h ssh_config.0 ssh_config.5 sshd_config.0 sshd_config.5 ; do + sed -i -e 's@%{_prefix}@/usr@g' $i + done +%endif %{?suse_update_config:%{suse_update_config}} aclocal autoheader @@ -176,12 +188,12 @@ cd ../../x11-ssh-askpass-%{xversion} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \ - --mandir=%{prefix}/X11R6/man \ - --prefix=%{prefix} \ + --mandir=%{_mandir} \ + --prefix=%{_prefix} \ --libexecdir=%{prefix}/%_lib/ssh xmkmf -make includes USRLIBDIR=/usr/X11R6/%_lib -make %{?jobs:-j%jobs} USRLIBDIR=/usr/X11R6/%_lib CCOPTIONS="$RPM_OPT_FLAGS" +make includes USRLIBDIR=%_prefix/%_lib +make %{?jobs:-j%jobs} USRLIBDIR=%_prefix/%_lib CCOPTIONS="$RPM_OPT_FLAGS" %install make DESTDIR=$RPM_BUILD_ROOT/ install @@ -200,8 +212,7 @@ rm -rf $RPM_BUILD_ROOT/usr/%_lib/ssh/ssh-askpass sed -e "s@usr/lib/ssh@usr/%_lib/ssh@" < %{S:8} > $RPM_BUILD_ROOT/usr/%_lib/ssh/ssh-askpass rm -f $RPM_BUILD_ROOT/usr/share/Ssh.bin -cat $RPM_BUILD_ROOT/etc/ssh/sshd_config | sed -e s@/usr/libexec@/usr/%{_lib}@g >$RPM_BUILD_ROOT/etc/ssh/sshd_config.tmp -mv -f $RPM_BUILD_ROOT/etc/ssh/sshd_config.tmp $RPM_BUILD_ROOT/etc/ssh/sshd_config +sed -i -e s@/usr/libexec@/usr/%{_lib}@g $RPM_BUILD_ROOT/etc/ssh/sshd_config %pre /usr/sbin/groupadd -g 65 -o -r sshd 2> /dev/null || : @@ -242,7 +253,7 @@ /usr/sbin/* %attr(444,root,root) %doc %{_mandir}/man1/scp.1.gz %attr(444,root,root) %doc %{_mandir}/man1/ssh-keygen.1.gz -%attr(444,root,root) %doc %{_mandir}/man1/ssh-keyconverter.1.gz +%attr(444,root,root) %doc /usr/share/man/man1/ssh-keyconverter.1.gz %attr(444,root,root) %doc %{_mandir}/man1/ssh.1.gz %attr(444,root,root) %doc %{_mandir}/man1/slogin.1.gz %attr(444,root,root) %doc %{_mandir}/man1/ssh-agent.1* @@ -263,11 +274,13 @@ %defattr(-,root,root) %attr(0755,root,root) /usr/%_lib/ssh/ssh-askpass %attr(0755,root,root) /usr/%_lib/ssh/x11-ssh-askpass -%doc /usr/X11R6/man/man1/ssh-askpass.1x.gz -%doc /usr/X11R6/man/man1/x11-ssh-askpass.1x.gz -%config /usr/X11R6/lib/X11/app-defaults/SshAskpass +%doc %_mandir/man1/ssh-askpass.1x.gz +%doc %_mandir/man1/x11-ssh-askpass.1x.gz +%config %_appdefdir/SshAskpass %changelog -n openssh +* Thu Aug 03 2006 - postadal@suse.cz +- fixed build with X11R7 * Thu Jul 20 2006 - postadal@suse.cz - updated to version 4.3p2 * experimental support for tunneling network packets via tun(4) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...