Build with GSS-API support by default

[shibboleth/cpp-sp.git] / shibboleth.spec.in

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index f7dee46..26c3b20 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -22,8 +22,8 @@ BuildRequires:        libXerces-c-devel >= 2.8.0
 BuildRequires: libxerces-c-devel >= 2.8.0
 %endif
 BuildRequires: libxml-security-c-devel >= 1.4.0
-BuildRequires: libxmltooling-devel >= 1.5
-BuildRequires: libsaml-devel >= 2.5
+BuildRequires: libxmltooling-devel >= 1.5.0
+BuildRequires: libsaml-devel >= 2.5.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
 %if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
@@ -31,6 +31,7 @@ Requires:     libcurl-openssl%{?_isa} >= 7.21.7
 BuildRequires: chrpath
 %endif
 BuildRequires:  gcc-c++, zlib-devel, boost-devel >= 1.32.0
+%{!?_without_gssapi:BuildRequires: krb5-devel}
 %{!?_without_doxygen:BuildRequires: doxygen}
 %{!?_without_odbc:BuildRequires:unixODBC-devel}
 %{?_with_fastcgi:BuildRequires: fcgi-devel}
@@ -39,7 +40,11 @@ BuildRequires:       libmemcached-devel
 %endif
 %{?_with_memcached:BuildRequires: libmemcached-devel}
 %if "%{_vendor}" == "redhat"
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
+%{!?_without_builtinapache:BuildRequires: httpd-devel%{?_isa}}
+%else
 %{!?_without_builtinapache:BuildRequires: httpd-devel}
+%endif
 BuildRequires: redhat-rpm-config
 Requires(pre): shadow-utils
 Requires(post): chkconfig
@@ -76,8 +81,8 @@ Requires:     libXerces-c-devel >= 2.8.0
 Requires:      libxerces-c-devel >= 2.8.0
 %endif
 Requires:      libxml-security-c-devel >= 1.4.0
-Requires:      libxmltooling-devel >= 1.5
-Requires:      libsaml-devel >= 2.5
+Requires:      libxmltooling-devel >= 1.5.0
+Requires:      libsaml-devel >= 2.5.0
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
 
@@ -93,9 +98,9 @@ This package includes files needed for development with Shibboleth.
 
 %build
 %if 0%{?centos_version} >= 600
-       %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_memcached:--with-memcached} %{?shib_options}
+       %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{?shib_options}
 %else
-       %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{?_with_memcached} %{?shib_options}
+       %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{?shib_options}
 %endif
 %{__make} pkgdocdir=%{pkgdocdir}
 
@@ -331,6 +336,9 @@ fi
 %doc %{pkgdocdir}/api
 
 %changelog
+* Sat Jun 8 2013   Scott Cantor  <cantor.2@osu.edu>  - 2.5.2-1
+- Add --with-gssapi using MIT K5 by default
+
 * Tue Sep 25 2012  Scott Cantor  <cantor.2@osu.edu>  - 2.5.1-1
 - Merge back various changes used in released packages
 - Prep for 2.5.1 by pulling extra restart out