--- shibboleth.spec.in.orig	2013-06-16 21:43:47.000000000 +0200
+++ shibboleth.spec.in	2013-07-29 14:42:22.887422969 +0200
@@ -59,7 +59,7 @@
 %if "%{_vendor}" == "suse"
 %define pkgdocdir %{_docdir}/shibboleth
 %else
-%define pkgdocdir %{_docdir}/shibboleth-%{version}
+%define pkgdocdir %{_docdir}/shibboleth
 %endif
 
 %description
@@ -203,14 +203,6 @@
 /sbin/ldconfig
 %endif
 
-# Key generation or ownership fix
-cd %{_sysconfdir}/shibboleth
-if [ -f sp-key.pem ] ; then
-	%{__chown} %{runuser}:%{runuser} sp-key.pem sp-cert.pem 2>/dev/null || :
-else
-	sh ./keygen.sh -b -u %{runuser} -g %{runuser}
-fi
-
 # Fix ownership of log files (even on new installs, if they're left from an older one).
 %{__chown} %{runuser}:%{runuser} %{_localstatedir}/log/shibboleth/* 2>/dev/null || :
 
@@ -304,7 +296,7 @@
 %{_libdir}/shibboleth/*
 %attr(0750,%{runuser},%{runuser}) %dir %{_localstatedir}/log/shibboleth
 %attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/run/shibboleth
-%attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/cache/shibboleth
+%attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/db/shibboleth
 %dir %{_datadir}/xml/shibboleth
 %{_datadir}/xml/shibboleth/*
 %dir %{_datadir}/shibboleth
