From 9a70078427beb6bf9d3f56ae4d988c07afa3d76cbb8b870967c664854da64478 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Mon, 19 May 2014 07:33:04 +0000
Subject: [PATCH 1/2] Accepting request 234494 from
 home:heinemannj66:rsyslog-v8

Rename required build package from json to json-c

OBS-URL: https://build.opensuse.org/request/show/234494
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=189
---
 rsyslog.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rsyslog.spec b/rsyslog.spec
index 9ddcb94..4d22e89 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -144,11 +144,11 @@ BuildRequires:  libnet-devel
 # mmnormalize support
 BuildRequires:  pkgconfig(libee) >= 0.4.0
 BuildRequires:  pkgconfig(lognorm) >= 1.0.0
-%endif # with mmnormalize
+%endif
 #
 # mmjsonparse needs liblognorm,
 # but json check is unconditional
-BuildRequires:  pkgconfig(json) >= 0.9
+BuildRequires:  pkgconfig(json-c) >= 0.9
 BuildRequires:  pkgconfig(libee) >= 0.4.0
 BuildRequires:  pkgconfig(libestr) >= 0.1.9
 BuildRequires:  pkgconfig(uuid) >= 2.21.0

From bdac71bbabfb0cac4859881fe6cf34ea0b7a09671ac43f8972e65c9287c4039e Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Mon, 19 May 2014 08:04:46 +0000
Subject: [PATCH 2/2] - rpm: use _rundir rpm macro if defined (bnc#873857)

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

diff --git a/rsyslog.changes b/rsyslog.changes
index 0670803..f6c21de 100644
--- a/rsyslog.changes
+++ b/rsyslog.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 19 07:37:34 UTC 2014 - mt@suse.com
+
+- rpm: use _rundir rpm macro if defined (bnc#873857)
+
 -------------------------------------------------------------------
 Sat May 17 10:02:12 UTC 2014 - heinemannj66@gmail.com
 
diff --git a/rsyslog.spec b/rsyslog.spec
index 4d22e89..7e9f387 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -60,7 +60,11 @@ Release:        0
 %bcond_with     zeromq
 %define         upstream_version            %{version}
 %define         rsyslogdocdir               %{_docdir}/%{name}
+%if %{defined _rundir}
+%define         rsyslog_rundir              %{_rundir}/rsyslog
+%else
 %define         rsyslog_rundir              %{_localstatedir}/run/rsyslog
+%endif
 %define         rsyslog_sockets_cfg         %{rsyslog_rundir}/additional-log-sockets.conf
 %define         rsyslog_module_dir_nodeps   %{_libdir}/rsyslog/
 %define         rsyslog_module_dir_withdeps %{_libdir}/rsyslog/