pool/rsyslog
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove bcond

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=238
This commit is contained in:
Andreas Stieger 2016-01-12 11:01:40 +00:00 committed by Git OBS Bridge
parent 135e617ff6
commit aac5b2232a
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsyslog.changes
View File

@ -1,5 +1,5 @@
-------------------------------------------------------------------
Mon Jan 11 19:32:29 UTC 2016 - astieger@suse.com
Tue Jan 12 11:01:17 UTC 2016 - astieger@suse.com
- build with libfastjson (mandatory from 8.16.0)

13
rsyslog.spec
View File

@ -65,8 +65,6 @@ Release: 0
%bcond_with hiredis
%bcond_with zeromq
%bcond_without 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}