Accepting request 567590 from Base:System

- remove build dependency on libee (forwarded request 567589 from AndreasStieger)

OBS-URL: https://build.opensuse.org/request/show/567590
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=134
This commit is contained in:
Dominique Leuenberger 2018-01-21 14:47:03 +00:00 committed by Git OBS Bridge
commit 6e16035ad2
2 changed files with 6 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 19 08:48:59 UTC 2018 - rgerhards@adiscon.com
- remove build dependency on libee
-------------------------------------------------------------------
Thu Dec 7 14:56:03 CET 2017 - kukuk@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package rsyslog
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -187,10 +187,8 @@ BuildRequires: libnet-devel
%if %{with mmnormalize}
# mmnormalize support
%if %{with pkgconfig}
BuildRequires: pkgconfig(libee) >= 0.4.0
BuildRequires: pkgconfig(lognorm) >= 2.0.3
%else
BuildRequires: libee-devel >= 0.4.0
BuildRequires: liblognorm-devel >= 2.0.3
%endif
%endif
@ -201,12 +199,10 @@ BuildRequires: pkgconfig(libmaxminddb)
# mmjsonparse needs liblognorm,
# but json check is unconditional
%if %{with pkgconfig}
BuildRequires: pkgconfig(libee) >= 0.4.0
BuildRequires: pkgconfig(libestr) >= 0.1.9
BuildRequires: pkgconfig(libfastjson) >= 0.99.7
BuildRequires: pkgconfig(uuid) >= 2.21.0
%else
BuildRequires: libee-devel >= 0.4.0
BuildRequires: libestr-devel
BuildRequires: libfastjson-devel >= 0.99.7
BuildRequires: libuuid-devel