Accepting request 353229 from Base:System

- build with libfastjson (mandatory from 8.16.0)

OBS-URL: https://build.opensuse.org/request/show/353229
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=113
This commit is contained in:
Dominique Leuenberger 2016-01-12 15:14:05 +00:00 committed by Git OBS Bridge
commit 66c4fd791b
2 changed files with 7 additions and 11 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 12 11:01:17 UTC 2016 - astieger@suse.com
- build with libfastjson (mandatory from 8.16.0)
-------------------------------------------------------------------
Sat Jan 2 20:03:23 UTC 2016 - astieger@suse.com

View File

@ -65,8 +65,6 @@ Release: 0
%bcond_with hiredis
%bcond_with zeromq
%bcond_with libfastjson
%define rsyslogdocdir %{_docdir}/%{name}
%if %{defined _rundir}
%define rsyslog_rundir %{_rundir}/rsyslog
@ -187,22 +185,15 @@ BuildRequires: liblognorm-devel >= 1.1.2
#
# mmjsonparse needs liblognorm,
# but json check is unconditional
%if %{with libfastjson}
BuildRequires: pkgconfig(libfastjson)
%else
%if %{with pkgconfig}
BuildRequires: pkgconfig(json-c) >= 0.9
%else
BuildRequires: libjson-c-devel
%endif
%endif
%if %{with pkgconfig}
BuildRequires: pkgconfig(libee) >= 0.4.0
BuildRequires: pkgconfig(libestr) >= 0.1.9
BuildRequires: pkgconfig(libfastjson)
BuildRequires: pkgconfig(uuid) >= 2.21.0
%else
BuildRequires: libee-devel >= 0.4.0
BuildRequires: libestr-devel
BuildRequires: libfastjson-devel
BuildRequires: libuuid-devel
%endif
%if %{with systemd}