summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Slebodnik <lslebodn@redhat.com>2015-07-24 09:24:31 +0200
committerJakub Hrozek <jhrozek@redhat.com>2015-09-23 15:48:32 +0200
commitf230eda50faaf95b5aaac7f4ec5ad6ab338930b1 (patch)
tree75508bf43239ef2d50b831be5b60bfc3f48c5d2b
parent7cac5068960ae53ea91cb1b304b4c697c5dca547 (diff)
downloadsssd-f230eda50faaf95b5aaac7f4ec5ad6ab338930b1.tar.gz
sssd-f230eda50faaf95b5aaac7f4ec5ad6ab338930b1.tar.xz
sssd-f230eda50faaf95b5aaac7f4ec5ad6ab338930b1.zip
SPEC: Update spec file for krb5_local_auth_plugin
krb5_localauth_plugin could be build only with MIT kerberos >= 1.12. However, this feature was backported in downstream to older version of kerberos. So there were packaging failures error: Installed (but unpackaged) file(s) found: /usr/lib/sssd/modules/sssd_krb5_localauth_plugin.so RPM build errors: Installed (but unpackaged) file(s) found: /usr/lib/sssd/modules/sssd_krb5_localauth_plugin.so Child returncode was: 1 EXCEPTION: Command failed. See logs for output. Reviewed-by: Petr Cech <pcech@redhat.com> (cherry picked from commit b0ee27fd94f1d20d9c220754ae008a3189752287)
-rw-r--r--contrib/sssd.spec.in7
1 files changed, 2 insertions, 5 deletions
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 0828bb8df..bad078ab5 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -1,3 +1,4 @@
+%global rhel6_minor %(%{__grep} -o "6.[0-9]*" /etc/redhat-release |%{__sed} -s 's/6.//')
%global rhel7_minor %(%{__grep} -o "7.[0-9]*" /etc/redhat-release |%{__sed} -s 's/7.//')
# Fedora and RHEL 6+
@@ -37,7 +38,7 @@
%global with_cifs_utils_plugin_option --disable-cifs-idmap-plugin
%endif
-%if (0%{?fedora} >= 21 || (0%{?rhel} == 7 && 0%{?rhel7_minor} >= 1))
+%if (0%{?fedora} || (0%{?rhel} == 7 && 0%{?rhel7_minor} >= 1) || (0%{?rhel} == 6 && 0%{?rhel6_minor} >= 7))
%global with_krb5_localauth_plugin 1
%endif
@@ -96,11 +97,7 @@ BuildRequires: pcre-devel
BuildRequires: libxslt
BuildRequires: libxml2
BuildRequires: docbook-style-xsl
-%if (0%{?with_krb5_localauth_plugin} == 1)
-BuildRequires: krb5-devel >= 1.12
-%else
BuildRequires: krb5-devel
-%endif
BuildRequires: c-ares-devel
BuildRequires: python-devel
BuildRequires: check-devel