Remove schema path env var.

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

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 0a93fd4..207eeed 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -65,6 +65,7 @@ daemon, default plugins, and Apache module(s).
 Summary:       Shibboleth Development Headers
 Group:         Development/Libraries/C and C++
 Requires:      %{name} = %{version}-%{release}
+Obsoletes:     shibboleth-devel < %{version}-%{release}
 %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
 Requires:      libXerces-c-devel >= 2.8.0
 %else
@@ -226,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