  %else
  	if [ $1 -eq 0 ] ; then
  		/sbin/service shibd stop >/dev/null 2>&1
-@@ -383,6 +433,7 @@
+@@ -366,6 +416,7 @@
+ %if "%{_vendor}" == "suse"
+ %if 0%{?suse_version} >= 1210
+         %service_del_preun shibd.service
++        %service_del_preun shibfcgi.service
+ %else
+ 	%stop_on_removal shibd
+ %endif
+@@ -383,6 +434,7 @@
  # On upgrade, restart components if they're already running.
  %if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
  	%systemd_postun_with_restart shibd.service

 	%restart_on_update shibd
 	%{insserv_cleanup}
 %endif
@@ -425,6 +476,8 @@
 %exclude %{_libdir}/*.la
 %dir %{_libdir}/shibboleth
 %{_libdir}/shibboleth/*.so

 
 	# Get run directory created at boot time.
 	%{__mkdir} -p $RPM_BUILD_ROOT%{_tmpfilesdir}
@@ -205,8 +215,7 @@
 [Unit]
 Description=Shibboleth Service Provider Daemon
 Documentation=https://wiki.shibboleth.net/confluence/display/SP3/Home
-After=network.target
-Before=httpd.service
+After=network-online.target
 
 [Service]
 Type=notify
@@ -216,9 +225,6 @@
 Environment=LD_LIBRARY_PATH=/opt/shibboleth/%{_lib}
 %endif
 ExecStart=%{_sbindir}/shibd -f -F
