Include xmltooling and opensaml in configure

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

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 69849e1..cfb1615 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -89,9 +89,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_memcached:--with-memcached} %{?shib_options} --with-gssapi=%{_prefix} --with-xmltooling=%{_prefix} --with-opensaml=%{_prefix}
 %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} %{?_with_memcached} %{?shib_options} --with-gssapi=%{_prefix} --with-xmltooling=%{_prefix} --with-opensaml=%{_prefix}
 %endif
 %{__make} pkgdocdir=%{pkgdocdir}
 
@@ -227,15 +227,6 @@ fi
 
        # This adds the proper /etc/rc*.d links for the script
        /sbin/chkconfig --add shibd
-
-       # On upgrade, restart components if they're already running.
-       # This gets repeated now down in %postun, and the next release
-       # should remove this copy. If we yank it now, we'll break upgrades.
-       if [ "$1" -gt "1" ] ; then
-               /etc/init.d/shibd status 1>/dev/null && /etc/init.d/shibd restart 1>/dev/null
-               %{!?_without_builtinapache:/etc/init.d/httpd status 1>/dev/null && /etc/init.d/httpd restart 1>/dev/null}
-               exit 0
-       fi
 %endif
 %if "%{_vendor}" == "suse"
        # This adds the proper /etc/rc*.d links for the script