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

rsyslog 8.23.0

OBS-URL: https://build.opensuse.org/request/show/443731
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=250
This commit is contained in:
2016-12-04 21:23:37 +00:00
committed by Git OBS Bridge
parent 51d6114542
commit 7decd5da9e
6 changed files with 81 additions and 13 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.20.0
Version: 8.23.0
Release: 0
%if 0%{?suse_version} >= 1210
%bcond_without systemd
@@ -57,6 +57,7 @@ Release: 0
%bcond_without elasticsearch
%bcond_without omhttpfs
%bcond_without omamqp1
%bcond_without tcl
# contributed modules not built for various reasons
# --enable-mmgrok - grok not in factory
# --enable-omkafka - librdkafka not in factory
@@ -200,18 +201,21 @@ BuildRequires: liblognorm-devel >= 1.1.2
%if %{with pkgconfig}
BuildRequires: pkgconfig(libee) >= 0.4.0
BuildRequires: pkgconfig(libestr) >= 0.1.9
# 0.99.3 will become mandatory in 8.20.1
# BuildRequires: pkgconfig(libfastjson) >= 0.99.3
BuildRequires: pkgconfig(libfastjson) >= 0.99.0
BuildRequires: pkgconfig(libfastjson) >= 0.99.3
BuildRequires: pkgconfig(uuid) >= 2.21.0
%else
BuildRequires: libee-devel >= 0.4.0
BuildRequires: libestr-devel
# 0.99.3 will become mandatory in 8.20.1
# BuildRequires: libfastjson-devel >= 0.99.3
BuildRequires: libfastjson-devel >= 0.99.0
BuildRequires: libfastjson-devel >= 0.99.3
BuildRequires: libuuid-devel
%endif
%if %{with tcl}
%if %{with pkgconfig}
BuildRequires: pkgconfig(tcl)
%else
BuildRequires: tcl-devel
%endif
%endif
%if %{with systemd}
%{?systemd_requires}
BuildRequires: pkgconfig(systemd)
@@ -549,6 +553,19 @@ package.
This module provides support for AMQP.
%endif
%if %{with tcl}
%package module-omtcl
Requires: %{name} = %{version}
Summary: TCL output module for rsyslog
Group: System/Daemons
%description module-omtcl
Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog
package.
This module provides an output module for TCL.
%endif
%prep
%setup -q -a 14
%patch0 -p1
@@ -677,6 +694,9 @@ autoreconf -fiv
--enable-libgcrypt \
%else
--disable-libgcrypt \
%endif
%if %{with tcl}
--enable-omtcl \
%endif
--enable-usertools \
--disable-static
@@ -1177,4 +1197,10 @@ fi
%{_bindir}/rsgtutil
%endif
%if %{with tcl}
%files module-omtcl
%defattr(-,root,root)
%{rsyslog_module_dir_withdeps}/omtcl.so*
%endif
%changelog