/var/lib/openssl -> /etc/openssl trigger improvements from AC-branch

diff --git a/openssl.spec b/openssl.spec
index 7498c8daa20d125785e9d98ffa0ae232756dfbe9..3e91506ced89dd3af3b536474761a3f72a3dd72a 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -386,6 +386,10 @@ if [ -L /var/lib/openssl/openssl.cnf ] ; then
 fi
 %else
 %triggerpostun -- %{name} < 0.9.8i-2
 fi
 %else
 %triggerpostun -- %{name} < 0.9.8i-2

+# don't do anything on --downgrade
+if [ $1 -le 1 ]; then
+       exit 0
+fi

 if [ -d /var/lib/openssl/certs ] ; then
        mv /var/lib/openssl/certs/* %{_sysconfdir}/%{name}/certs 2>/dev/null || :
 fi
 if [ -d /var/lib/openssl/certs ] ; then
        mv /var/lib/openssl/certs/* %{_sysconfdir}/%{name}/certs 2>/dev/null || :
 fi


@@ -396,6 +400,8 @@ if [ -d /var/lib/openssl ] ; then
        for f in /var/lib/openssl/* ; do
                [ -f "$f" ] && mv "$f" %{_sysconfdir}/%{name} 2>/dev/null || :
        done
        for f in /var/lib/openssl/* ; do
                [ -f "$f" ] && mv "$f" %{_sysconfdir}/%{name} 2>/dev/null || :
        done

+       rmdir /var/lib/openssl/* 2>/dev/null || :
+       rmdir /var/lib/openssl 2>/dev/null || :

 fi
 %endif
 
 fi
 %endif