Hello community, here is the log from the commit of package openssh-askpass for openSUSE:Factory checked in at 2014-07-28 06:31:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssh-askpass (Old) and /work/SRC/openSUSE:Factory/.openssh-askpass.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openssh-askpass" Changes: -------- --- /work/SRC/openSUSE:Factory/openssh-askpass/openssh-askpass.changes 2013-03-11 09:51:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openssh-askpass.new/openssh-askpass.changes 2014-07-28 06:31:04.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 8 14:09:57 UTC 2014 - pcerny@suse.com + +- change the Supplements tag to combination of both openssh and X11 + to prevent accidental imports of the X11 packages into minimal + installs (bnc#886235) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssh-askpass.spec ++++++ --- /var/tmp/diff_new_pack.gC2j8z/_old 2014-07-28 06:31:05.000000000 +0200 +++ /var/tmp/diff_new_pack.gC2j8z/_new 2014-07-28 06:31:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package openssh-askpass # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,19 @@ # +%if 0%{suse_version} < 1100 +%define _xprefix /usr/X11R6 +%define _mandir %{_xprefix}/man +%define _appdefdir %{_xprefix}/lib/X11/app-defaults +%else +%define _appdefdir %{_prefix}/share/X11/app-defaults +%endif + Name: openssh-askpass BuildRequires: xorg-x11-devel +%if 0%{?suse_version} < 1100 +BuildRequires: xorg-x11-libs +%endif Version: 1.2.4.1 Release: 0 Summary: A passphrase dialog for OpenSSH and the X Window System @@ -29,7 +40,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: openssh Provides: openssh:%{_libexecdir}/ssh/ssh-askpass -Supplements: openssh +Supplements: packageand(openssh:libX11-6) %description Ssh (Secure Shell) is a program for logging into a remote machine and @@ -41,11 +52,20 @@ %patch1 %build -%configure \ - --libexecdir=%{_libdir}/ssh +LDFLAGS="-pie" +CFLAGS="$RPM_OPT_FLAGS $PIEFLAGS -fstack-protector -fPIC" +CXXFLAGS="$RPM_OPT_FLAGS $PIEFLAGS -fstack-protector" +export LDFLAGS CFLAGS CXXFLAGS CPPFLAGS +./configure \ + --prefix=%{_prefix} \ + --mandir=%{_mandir} \ + --libexecdir=%{_libexecdir}/ssh \ + xmkmf -make includes USRLIBDIR=%{_libdir} -make %{?_smp_mflags} USRLIBDIR=%{_libdir} CCOPTIONS="%{optflags}" +#make includes USRLIBDIR=%{_libdir} +#make %{?_smp_mflags} USRLIBDIR=%{_libdir} CCOPTIONS="%{optflags}" +make includes +make %{?_smp_mflags} %install make BINDIR=%{_libexecdir}/ssh DESTDIR=%{buildroot} install install.man @@ -57,6 +77,9 @@ %dir %{_libexecdir}/ssh %attr(0755,root,root) %{_libexecdir}/ssh/x11-ssh-askpass %doc %{_mandir}/man1/x11-ssh-askpass.1x.gz -/usr/share/X11/app-defaults +%{_appdefdir}/* +%if 0%{?suse_version} >= 1140 +%dir %{_appdefdir} +%endif %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org