commit openssh-askpass for openSUSE:Factory
Hello community,
here is the log from the commit of package openssh-askpass for openSUSE:Factory
checked in at 2014-10-23 14:19:42
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
2014-07-28 06:31:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.openssh-askpass.new/openssh-askpass.changes
2014-10-23 14:19:44.0 +0200
@@ -1,0 +2,6 @@
+Sat Oct 4 01:44:25 UTC 2014 - crrodrig...@opensuse.org
+
+ Cleanup BUildRequires in newer products to avoid-
+ pulling the entire X library set.
+
+---
Other differences:
--
++ openssh-askpass.spec ++
--- /var/tmp/diff_new_pack.vVQy6Z/_old 2014-10-23 14:19:46.0 +0200
+++ /var/tmp/diff_new_pack.vVQy6Z/_new 2014-10-23 14:19:46.0 +0200
@@ -25,9 +25,12 @@
%endif
Name: openssh-askpass
+%if 0%{?suse_version} < 1220
BuildRequires: xorg-x11-devel
-%if 0%{?suse_version} < 1100
-BuildRequires: xorg-x11-libs
+%else
+BuildRequires: imake
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xt)
%endif
Version:1.2.4.1
Release:0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit openssh-askpass for openSUSE:Factory
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.0 +0100
+++ /work/SRC/openSUSE:Factory/.openssh-askpass.new/openssh-askpass.changes
2014-07-28 06:31:04.0 +0200
@@ -1,0 +2,7 @@
+Tue Jul 8 14:09:57 UTC 2014 - pce...@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.0 +0200
+++ /var/tmp/diff_new_pack.gC2j8z/_new 2014-07-28 06:31:05.0 +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+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit openssh-askpass for openSUSE:Factory
Hello community,
here is the log from the commit of package openssh-askpass for openSUSE:Factory
checked in at 2013-03-11 09:51:31
Comparing /work/SRC/openSUSE:Factory/openssh-askpass (Old)
and /work/SRC/openSUSE:Factory/.openssh-askpass.new (New)
Package is "openssh-askpass", Maintainer is "pce...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/openssh-askpass/openssh-askpass.changes
2012-06-25 11:51:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.openssh-askpass.new/openssh-askpass.changes
2013-03-11 09:51:32.0 +0100
@@ -1,0 +2,5 @@
+Tue Mar 5 05:57:08 UTC 2013 - co...@suse.com
+
+- update license to new format
+
+---
Other differences:
--
++ openssh-askpass.spec ++
--- /var/tmp/diff_new_pack.EJDwNm/_old 2013-03-11 09:51:33.0 +0100
+++ /var/tmp/diff_new_pack.EJDwNm/_new 2013-03-11 09:51:33.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package openssh
+# spec file for package openssh-askpass
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -21,7 +21,7 @@
Version:1.2.4.1
Release:0
Summary:A passphrase dialog for OpenSSH and the X Window System
-License:BSD-3-Clause ; MIT
+License:BSD-3-Clause and MIT
Group: Productivity/Networking/SSH
Url: http://www.jmknoble.net/software/x11-ssh-askpass/
Source0:x11-ssh-askpass-%{version}.tar.bz2
@@ -52,7 +52,6 @@
rm -f %{buildroot}%{_libexecdir}/ssh/ssh-askpass
rm -f %{buildroot}%{_mandir}/man1/ssh-askpass.1x
-
%files
%defattr(-,root,root)
%dir %{_libexecdir}/ssh
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
