From ac1e85b3bfac6840c0ecf404a11c535a64adebac Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m@gmail.com>
Date: Dec 28 2020 10:11:38 +0000
Subject: Reorder scriptlets


Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>

---

diff --git a/dnscrypt-proxy.spec b/dnscrypt-proxy.spec
index 17f592b..e8eb98f 100644
--- a/dnscrypt-proxy.spec
+++ b/dnscrypt-proxy.spec
@@ -44,7 +44,7 @@ Features:
  - Can force outgoing connections to use TCP; useful with tunnels such as Tor.}
 
 Name:           dnscrypt-proxy
-Release:        4%{?dist}
+Release:        8%{?dist}
 Summary:        Flexible DNS proxy, with support for encrypted DNS protocols
 
 License:        ISC
@@ -115,9 +115,15 @@ install -p -m 644 -D my-ptproxy.pp %{buildroot}%{_datadir}/selinux/packages/%{na
 
 %post
 if [ "$1" -le "1" ] ; then # First install
-dnscrypt-proxy -service install
+dnscrypt-proxy -service install --config %{_sysconfdir}/dnscrypt-proxy/dnscrypt-proxy.toml
 semodule -i %{_datadir}/selinux/packages/%{name}/my-ptproxy.pp 2>/dev/null || :
 fi
+if [ "$1" -ge "2" ] ; then
+# Remove in F36
+rm -rf %{_unitdir}/dnscrypt-proxy.service %{_unitdir}/dnscrypt-proxy.socket
+dnscrypt-proxy -service uninstall
+dnscrypt-proxy -service install --config %{_sysconfdir}/dnscrypt-proxy/dnscrypt-proxy.toml
+fi
 
 %preun
 if [ "$1" -lt "1" ] ; then # Final removal
@@ -128,7 +134,7 @@ fi
 %postun
 if [ "$1" -ge "1" ] ; then # Upgrade
 dnscrypt-proxy -service uninstall
-dnscrypt-proxy -service install
+dnscrypt-proxy -service install --config %{_sysconfdir}/dnscrypt-proxy/dnscrypt-proxy.toml
 semodule -i %{_datadir}/selinux/packages/%{name}/my-ptproxy.pp 2>/dev/null || :
 fi
 
@@ -137,6 +143,7 @@ fi
 %doc README.md ChangeLog
 %{_bindir}/%{name}
 %dir %{_sysconfdir}/%{name}
+%ghost %{_sysconfdir}/systemd/system/dnscrypt-proxy.service
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.toml
 %config(noreplace) %{_sysconfdir}/%{name}/blacklist.txt
 %config(noreplace) %{_sysconfdir}/%{name}/cloaking-rules.txt
@@ -145,6 +152,15 @@ fi
 %{_datadir}/selinux/packages/%{name}/my-ptproxy.pp
 
 %changelog
+* Mon Dec 28 10:46:59 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2.0.44-8
+- Reorder scriptlets
+
+* Mon Dec 28 09:59:16 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2.0.44-7
+- Install service with link toward correct config file
+
+* Mon Dec 28 09:41:32 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2.0.44-6
+- Force removal of previous service file
+
 * Wed Dec 16 13:35:53 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2.0.44-4
 - Fix config patch