Accepting request 395514 from home:jengelh:branches:network:ha-clustering:Factory

after looking at fedora SRPMS, I decided to do this differently
and only list templates on preun (and not have systemd-rpm-macros
do the filtering).

OBS-URL: https://build.opensuse.org/request/show/395514
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=41
This commit is contained in:
Kristoffer Gronlund 2016-05-16 12:08:29 +00:00 committed by Git OBS Bridge
parent 99961227a8
commit a3d0de449e
2 changed files with 5 additions and 4 deletions

View File

@ -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 - Avoid runtime dependency on systemd, the macros can all deal with
its absence. 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 Wed Apr 27 09:49:11 UTC 2016 - kgronlund@suse.com

View File

@ -98,10 +98,10 @@ touch %{buildroot}%{_sysconfdir}/csync2/csync2_ssl_key.pem
touch %{buildroot}%{_sysconfdir}/csync2/csync2_ssl_cert.pem touch %{buildroot}%{_sysconfdir}/csync2/csync2_ssl_cert.pem
%pre %pre
%service_add_pre csync2.socket csync2@.service %service_add_pre csync2.socket
%post %post
%service_add_post csync2.socket csync2@.service %service_add_post csync2.socket
umask 077 umask 077
if [ ! -f %{_sysconfdir}/csync2/csync2_ssl_key.pem ]; then 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 /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 fi
%postun %postun
%service_del_postun csync2.socket csync2@.service %service_del_postun csync2.socket
%files %files
%defattr(-,root,root) %defattr(-,root,root)