https://issues.shibboleth.net/jira/browse/SSPCPP-227

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

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 7ecbc44..b6f89d8 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -82,7 +82,7 @@ This package includes files needed for development with Shibboleth.
 
 %build
 %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{?_with_memcached} %{?shib_options}
-%{__make}
+%{__make} pkgdocdir=%{pkgdocdir}
 
 %install
 %{__make} install NOKEYGEN=1 DESTDIR=$RPM_BUILD_ROOT pkgdocdir=%{pkgdocdir}
@@ -211,12 +211,9 @@ sh ./keygen.sh -b
 %config(noreplace) %{_sysconfdir}/%{name}/*.xml
 %config(noreplace) %{_sysconfdir}/%{name}/*.html
 %config(noreplace) %{_sysconfdir}/%{name}/*.logger
-%if "%{_vendor}" == "redhat"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "suse"
 %attr(755, root, root) %{_initrddir}/shibd
 %endif
-%if "%{_vendor}" == "suse"
-%attr(755, root, root) %{_initddir}/shibd
-%endif
 %{_sysconfdir}/%{name}/*.dist
 %{_sysconfdir}/%{name}/apache*.config
 %{_sysconfdir}/%{name}/shibd-*