diff --git a/cockpit.spec b/cockpit.spec index a756b02..46e00f7 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -22,13 +22,18 @@ %define _hardened_build 1 +%define libssh_version 0.6.0 +%if 0%{?fedora} > 0 && 0%{?fedora} >= 22 +%define libssh_version 0.7.1 +%endif + Name: cockpit %if %{defined gitcommit} Version: %{gitcommit} %else Version: 0.65 %endif -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user interface for Linux servers License: LGPLv2+ @@ -49,7 +54,7 @@ BuildRequires: pam-devel BuildRequires: autoconf automake BuildRequires: intltool -BuildRequires: libssh-devel >= 0.6.0 +BuildRequires: libssh-devel >= %{libssh_version} BuildRequires: openssl-devel BuildRequires: zlib-devel BuildRequires: krb5-devel @@ -158,6 +163,7 @@ Summary: Cockpit Web Service Requires: glib-networking Requires: openssl Requires: glib2 >= 2.37.4 +Requires: libssh >= %{libssh_version} Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -432,6 +438,9 @@ fi %endif %changelog +* Fri Jul 17 2015 Peter - 0.65-2 +- Require libssh 0.7.1 on fedora >= 22 systems + * Wed Jul 15 2015 Peter - 0.65-1 - Update to 0.65 release