diff --git a/csync2.changes b/csync2.changes index 5ec24ce..4aa1eab 100644 --- a/csync2.changes +++ b/csync2.changes @@ -3,7 +3,8 @@ Fri May 6 21:13:01 UTC 2016 - jengelh@inai.de - Avoid runtime dependency on systemd, the macros can all deal with its absence. -- Call %systemd_pre/post/etc. on csync@.service template as well. +- Ensure csync@.service template instances are disabled on package + removal. ------------------------------------------------------------------- Wed Apr 27 09:49:11 UTC 2016 - kgronlund@suse.com diff --git a/csync2.spec b/csync2.spec index 0fe4171..d33ca87 100644 --- a/csync2.spec +++ b/csync2.spec @@ -98,10 +98,10 @@ touch %{buildroot}%{_sysconfdir}/csync2/csync2_ssl_key.pem touch %{buildroot}%{_sysconfdir}/csync2/csync2_ssl_cert.pem %pre -%service_add_pre csync2.socket csync2@.service +%service_add_pre csync2.socket %post -%service_add_post csync2.socket csync2@.service +%service_add_post csync2.socket umask 077 if [ ! -f %{_sysconfdir}/csync2/csync2_ssl_key.pem ]; then /usr/bin/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{_sysconfdir}/csync2/csync2_ssl_key.pem 2>/dev/null @@ -130,7 +130,7 @@ if [ $1 -eq 0 ]; then fi %postun -%service_del_postun csync2.socket csync2@.service +%service_del_postun csync2.socket %files %defattr(-,root,root)