From c87dba89f9ec3d5aa19329feda4b9982dddd0eecec62aa3dbbc99905a71f98d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Tue, 31 May 2011 22:12:56 +0000
Subject: [PATCH] Accepting request 72262 from
 home:a_jaeger:branches:openSUSE:Factory

Add systemd service file back (bnc#696963).

OBS-URL: https://build.opensuse.org/request/show/72262
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=58
---
 rsyslog.changes | 5 +++++
 rsyslog.spec    | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/rsyslog.changes b/rsyslog.changes
index e26ea85..665b173 100644
--- a/rsyslog.changes
+++ b/rsyslog.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 31 12:14:59 UTC 2011 - aj@suse.de
+
+- Add systemd service file back (bnc#696963).
+
 -------------------------------------------------------------------
 Fri May 27 07:53:38 UTC 2011 - mt@suse.de
 
diff --git a/rsyslog.spec b/rsyslog.spec
index 31567fe..68b44cd 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -409,10 +409,6 @@ install -m644 plugins/ompgsql/createDB.sql \
 	%{buildroot}%{rsyslogdocdir}/pgsql-createDB.sql
 %endif
 #
-%if %{with systemd}
-# TODO: https://features.opensuse.org/311316
-rm -v %{buildroot}/lib/systemd/system/rsyslog.service
-%endif
 
 %clean
 if [ -n "%{buildroot}" ] && [ "%{buildroot}" != "/" ] ; then
@@ -519,6 +515,7 @@ fi
 %config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.early.conf
 %config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/remote.conf
 %{_sbindir}/rsyslogd
+/lib/systemd/system/rsyslog.service
 %dir %{rsyslog_module_dir_nodeps}
 %{rsyslog_module_dir_nodeps}/imfile.so
 %{rsyslog_module_dir_nodeps}/imklog.so