Accepting request 569987 from home:AndreasStieger:branches:Base:System

rsyslog 8.32.0

OBS-URL: https://build.opensuse.org/request/show/569987
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=284
This commit is contained in:
2018-01-26 16:44:35 +00:00
committed by Git OBS Bridge
parent 6bf6bbd782
commit 25b131c4d8
7 changed files with 24 additions and 142 deletions

View File

@@ -25,7 +25,7 @@ Name: rsyslog
Summary: The enhanced syslogd for Linux and Unix
License: (GPL-3.0+ and Apache-2.0)
Group: System/Daemons
Version: 8.30.0
Version: 8.32.0
Release: 0
%if 0%{?suse_version} >= 1210
%bcond_without systemd
@@ -112,6 +112,7 @@ BuildRequires: automake
BuildRequires: libtool
#
BuildRequires: bison
BuildRequires: curl-devel
BuildRequires: flex
BuildRequires: openssl-devel >= 0.9.7
BuildRequires: pcre-devel
@@ -129,9 +130,6 @@ BuildRequires: pkgconfig(liblogging-stdlog) >= 1.0.1
%else
BuildRequires: liblogging-devel
%endif
%if %{with elasticsearch}
BuildRequires: curl-devel
%endif
%if %{with omhttpfs}
BuildRequires: curl-devel >= 7.0.0
%endif
@@ -149,7 +147,7 @@ BuildRequires: hiredis-devel >= 0.10.1
# TODO: PKG_CHECK_MODULES(LIBMONGO_CLIENT, libmongo-client >= 0.1.4)
%endif
%if %{with zeromq}
BuildRequires: czmq-devel >= 1.1.0
BuildRequires: czmq-devel >= 3.0.2
%endif
%if %{with gssapi}
BuildRequires: krb5-devel
@@ -200,7 +198,7 @@ BuildRequires: pkgconfig(libmaxminddb)
# but json check is unconditional
%if %{with pkgconfig}
BuildRequires: pkgconfig(libestr) >= 0.1.9
BuildRequires: pkgconfig(libfastjson) >= 0.99.7
BuildRequires: pkgconfig(libfastjson) >= 0.99.8
BuildRequires: pkgconfig(uuid) >= 2.21.0
%else
BuildRequires: libestr-devel
@@ -233,7 +231,6 @@ Source15: rsyslog.firewall
# PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs.
Patch0: rsyslog-unit.patch
Patch1: 0001-imgssapi-fix-compiler-warnings.patch
# this is a dirty hack since % dir does only work for the specified directory and nothing above
# but I want to be able to switch this to /etc/apparmor.d once the profiles received more testing
@@ -550,7 +547,6 @@ This module provides an output module for TCL.
%prep
%setup -q -a 14
%patch0 -p1
%patch1 -p1
#
%if %{with systemd}
for file in rsyslog-service-prepare; do