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

rsyslog 8.30.0

OBS-URL: https://build.opensuse.org/request/show/541858
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=273
This commit is contained in:
2017-11-14 15:35:02 +00:00
committed by Git OBS Bridge
parent 4471b875cb
commit e2f91a94e5
7 changed files with 184 additions and 10 deletions

View File

@@ -20,7 +20,7 @@ Name: rsyslog
Summary: The enhanced syslogd for Linux and Unix
License: (GPL-3.0+ and Apache-2.0)
Group: System/Daemons
Version: 8.29.0
Version: 8.30.0
Release: 0
%if 0%{?suse_version} >= 1210
%bcond_without systemd
@@ -95,7 +95,7 @@ Requires(pre): syslog-service >= 2.0
%{?systemd_requires}
BuildRequires: pkgconfig(systemd) >= 209
%if %{with journal}
BuildRequires: pkgconfig(libsystemd) >= 209
BuildRequires: pkgconfig(libsystemd) >= 234
%endif
%else
Requires(pre): %insserv_prereq %fillup_prereq /etc/init.d/syslog
@@ -198,12 +198,12 @@ BuildRequires: pkgconfig(libmaxminddb)
%if %{with pkgconfig}
BuildRequires: pkgconfig(libee) >= 0.4.0
BuildRequires: pkgconfig(libestr) >= 0.1.9
BuildRequires: pkgconfig(libfastjson) >= 0.99.3
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.3
BuildRequires: libfastjson-devel >= 0.99.7
BuildRequires: libuuid-devel
%endif
%if %{with tcl}
@@ -232,6 +232,7 @@ 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
@@ -548,6 +549,7 @@ 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