Working version with SUSE macros

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

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index c18ff11..82b309a 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -10,7 +10,7 @@ Source:     %{name}-sp-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 PreReq:     openssl
 %if 0%{?suse_version} > 1030
-PreReq:         %insserv_prere
+PreReq:         %{insserv_prereq}
 BuildRequires:  libXerces-c-devel >= 2.8.0
 BuildRequires:  libxml-security-c-devel >= 1.4.0
 BuildRequires:  libxmltooling-devel >= 1.2
@@ -124,11 +124,11 @@ fi
 
 %if "%{_vendor}" == "redhat" || "%{_vendor}" == "suse"
        # %{_initddir} not yet in RHEL5, use deprecated %{_initrddir}
-       mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-       install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initrddir}/shibd
+       install -d -m 0755 $RPM_BUILD_ROOT%{_initrddir}
+       install -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initrddir}/shibd
 %if "%{_vendor}" == "suse"
        install -d -m 0755 $RPM_BUILD_ROOT/%{_sbindir}
-       %{__ln} -sf $RPM_BUILD_ROOT%{_initrddir}/shibd $RPM_BUILD_ROOT/%{_sbindir}/rcshibd
+       %{__ln_s} -f %{_initrddir}/shibd $RPM_BUILD_ROOT%{_sbindir}/rcshibd
 %endif
 %endif
 
@@ -158,6 +158,7 @@ sh ./keygen.sh -b
 %endif
 %if "%{_vendor}" == "suse"
     # This adds the proper /etc/rc*.d links for the script
+    cd /
     %insserv_force_if_yast shibd
 %endif
 
@@ -177,8 +178,10 @@ sh ./keygen.sh -b
 /sbin/ldconfig
 %endif
 %if "%{_vendor}" == "suse"
-%restart_on_update shibd apache2
-%insserv_cleanup
+cd /
+%restart_on_update shibd
+%{!?_without_builtinapache:%restart_on_update apache2}
+%{insserv_cleanup}
 %endif
 
 %posttrans