From 8091e0b117afa0700cd9092da0bba1a2c9c85e5e Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Oct 16 2020 18:43:10 +0000
Subject: Move only directory, not symlink on upgrade (#1884575)


---

diff --git a/stubby.spec b/stubby.spec
index d75915c..faeb0e1 100644
--- a/stubby.spec
+++ b/stubby.spec
@@ -7,7 +7,7 @@
 
 Name:           stubby
 Version:        0.3.1
-Release:        0.6.%{git_suffix}%{?dist}
+Release:        0.7.%{git_suffix}%{?dist}
 Summary:        Application that act as a local DNS Privacy stub resolver
 
 License:        BSD
@@ -56,7 +56,7 @@ install -pm 0644 systemd/stubby.service %{buildroot}%{_unitdir}/stubby.service
 
 %post
 # systemd would replace it with symlink
-if [ -d "%{_localstatedir}/cache/%{name}" ]; then
+if [ ! -L "%{_localstatedir}/cache/%{name}" -a -d "%{_localstatedir}/cache/%{name}" ]; then
 	mv "%{_localstatedir}/cache/%{name}"{,.rpmsave}
 fi
 %systemd_post %{name}
@@ -78,6 +78,9 @@ fi
 
 
 %changelog
+* Fri Oct 16 2020 Petr Menšík <pemensik@redhat.com> - 0.3.1-0.7.20200318git7939e965
+- Move only directory, not symlink on upgrade (#1884575)
+
 * Mon Oct 05 2020 Petr Menšík <pemensik@redhat.com> - 0.3.1-0.6.20200318git7939e965
 - Move old cache directory on upgrade (#1884575)