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 9ddcb94..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/ @@ -144,11 +148,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