From 99961227a8cc5e80f10980e5f3b571adfffb091afbf3c4db72747545ede3755c Mon Sep 17 00:00:00 2001
From: Kristoffer Gronlund <kgronlund@suse.com>
Date: Fri, 13 May 2016 15:26:06 +0000
Subject: [PATCH] Accepting request 394099 from
 home:jengelh:branches:network:ha-clustering:Factory

- Avoid runtime dependency on systemd, the macros can all deal with
  its absence.
- Call %systemd_pre/post/etc. on csync@.service template as well.

OBS-URL: https://build.opensuse.org/request/show/394099
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=40
---
 csync2.changes |  7 +++++++
 csync2.spec    | 10 ++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/csync2.changes b/csync2.changes
index c8a84cd..5ec24ce 100644
--- a/csync2.changes
+++ b/csync2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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.
+
 -------------------------------------------------------------------
 Wed Apr 27 09:49:11 UTC 2016 - kgronlund@suse.com
 
diff --git a/csync2.spec b/csync2.spec
index 172ea1b..0fe4171 100644
--- a/csync2.spec
+++ b/csync2.spec
@@ -51,7 +51,6 @@ BuildRequires:  pkgconfig
 BuildRequires:  sqlite3-devel
 Requires:       openssl
 Requires:       sqlite3
-%{?systemd_requires}
 %if 0%{?suse_version} >= 1210
 BuildRequires:  systemd
 %endif
@@ -60,7 +59,6 @@ BuildRequires:  texlive-latex
 %if 0%{?suse_version} > 1220
 BuildRequires:  texlive-nopageno
 %endif
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -100,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
+%service_add_pre csync2.socket csync2@.service
 
 %post
-%service_add_post csync2.socket
+%service_add_post csync2.socket csync2@.service
 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
@@ -125,14 +123,14 @@ EOF
 fi
 
 %preun
-%service_del_preun csync2.socket
+%service_del_preun csync2.socket csync2@.service
 # Cleanup all databases upon last removal
 if [ $1 -eq 0 ]; then
   rm -f %{_localstatedir}/lib/csync2/*
 fi
 
 %postun
-%service_del_postun csync2.socket
+%service_del_postun csync2.socket csync2@.service
 
 %files
 %defattr(-,root,root)