X-Git-Url: https://git.tld-linux.org/?p=packages%2Fsyslog-ng.git;a=blobdiff_plain;f=syslog-ng.spec;h=679927c28b911027bfc8bd326c9afa120963cb53;hp=6598bb237ac6d893957e4209f830188fe93ff5bf;hb=e2663c45b1821d34e9f8cc0d7f6ce80deb2ee7c6;hpb=39261fbb5903f57b19fae2257ee756ac6c123753

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 6598bb2..679927c 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -7,7 +7,7 @@
 # Conditional build:
 %bcond_with	dynamic			# link dynamically with glib, eventlog, pcre (modules are always linked dynamically)
 %bcond_without	sql			# support for logging to SQL DB
-%bcond_without	tests			# do not perform "make check"
+%bcond_with	tests			# do not perform "make check"
 %bcond_without	http			# support for HTTP destination
 %bcond_without	json			# support for JSON template formatting
 %bcond_without	mongodb			# support for mongodb destination
@@ -30,23 +30,23 @@
 %define	libivykis_version 0.42.2
 
 %define		glib2_ver	1:2.24.0
-%define		mver	3.14
-%define		docmver	3.14
+%define		mver	3.15
+%define		docmver	3.15
 Summary:	Syslog-ng - new generation of the system logger
 Summary(pl.UTF-8):	Syslog-ng - systemowy demon logujący nowej generacji
 Summary(pt_BR.UTF-8):	Daemon de log nova geração
 Name:		syslog-ng
-Version:	3.14.1
-Release:	1
+Version:	3.15.1
+Release:	4
 License:	GPL v2+ with OpenSSL exception
 Group:		Daemons
 Source0:	https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	60c58c5e50860c5b81afb6e80abb0a04
+# Source0-md5:	ad97a307a9ae2f26615f0aa8f7ec320f
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.logrotate
 Source4:	https://syslog-ng.com/documents/html/syslog-ng-ose-%{docmver}-guides/en/syslog-ng-ose-guide-admin/pdf/syslog-ng-ose-guide-admin.pdf
-# Source4-md5:	4c22ec5a700f29d4d8dacb2d7c14797d
+# Source4-md5:	a0d5f955d313262d1ce3b73d77e4038b
 Source5:	%{name}-simple.conf
 Source6:	https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-%{libivykis_version}.tar.gz
 # Source6-md5:	aeafef422d8dafb84e1fcd16f9f4822e
@@ -63,7 +63,6 @@ BuildRequires:	automake
 BuildRequires:	bison >= 2.4
 %{?with_http:BuildRequires:	curl-devel}
 BuildRequires:	docbook-style-xsl
-BuildRequires:	eventlog-devel >= 0.2.12
 %{?with_tests:BuildRequires:	findutils}
 BuildRequires:	flex
 BuildRequires:	glib2-devel >= %{glib2_ver}
@@ -98,7 +97,6 @@ BuildRequires:	python-ply
 BuildRequires:	tzdata
 %endif
 %if %{without dynamic}
-BuildRequires:	eventlog-static >= 0.2.12
 BuildRequires:	glib2-static >= %{glib2_ver}
 %{?with_system_libivykis:BuildRequires:	libivykis-static >= %{libivykis_version}}
 BuildRequires:	pcre-static >= 6.1
@@ -110,7 +108,6 @@ Requires:	%{name}-libs = %{version}-%{release}
 Requires:	psmisc >= 20.1
 %{?with_system_rabbitmq:Requires:	rabbitmq-c >= 0.0.1}
 Requires:	rc-scripts >= 0.4.3.0
-Requires:	systemd-units >= 38
 # for afsocket
 Requires:	libnet >= 1:1.1.2.1-7
 # for afsocket and dbparser
@@ -284,7 +281,6 @@ Summary:	Shared library for syslog-ng
 Summary(pl.UTF-8):	Biblioteka współdzielona sysloga-ng
 Group:		Libraries
 %if %{with dynamic}
-Requires:	eventlog >= 0.2.12
 Requires:	glib2 >= %{glib2_ver}
 %{?with_system_libivykis:Requires:	libivykis >= 0.42}
 Requires:	pcre >= 6.1
@@ -303,7 +299,6 @@ Summary(pl.UTF-8):	Pliki nagłówkowe do tworzenia modułów dla sysloga-ng
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 %if %{with dynamic}
-Requires:	eventlog-devel >= 0.2.12
 Requires:	glib2-devel >= %{glib2_ver}
 %{?with_system_libivykis:Requires:	libivykis-devel >= 0.42}
 Requires:	pcre-devel >= 6.1
@@ -333,15 +328,11 @@ cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 %{__sed} -i -e 's|/usr/bin/awk|/bin/awk|' scl/syslogconf/convert-syslogconf.awk
 
 %build
-for i in . ; do
-cd $i
-	%{__libtoolize}
-	%{__aclocal} `[ -d m4 ] && echo '-I m4'`
-	%{__autoconf}
-	%{__autoheader}
-	%{__automake}
-cd -
-done
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--sysconfdir=%{_sysconfdir}/syslog-ng \
 	--disable-silent-rules \
@@ -520,6 +511,7 @@ exit 0
 %attr(755,root,root) %{moduledir}/libgeoip2-plugin.so
 %endif
 %attr(755,root,root) %{moduledir}/libgraphite.so
+%attr(755,root,root) %{moduledir}/libhook-commands.so
 %attr(755,root,root) %{moduledir}/libkvformat.so
 %attr(755,root,root) %{moduledir}/liblinux-kmsg-format.so
 %attr(755,root,root) %{moduledir}/libmap-value-pairs.so
@@ -543,7 +535,6 @@ exit 0
 %dir %{_datadir}/syslog-ng/include/scl
 %{_datadir}/syslog-ng/include/scl/apache
 %{_datadir}/syslog-ng/include/scl/default-network-drivers
-%{_datadir}/syslog-ng/include/scl/elasticsearch
 %{_datadir}/syslog-ng/include/scl/graphite
 %{_datadir}/syslog-ng/include/scl/hdfs
 %{_datadir}/syslog-ng/include/scl/kafka
@@ -551,8 +542,6 @@ exit 0
 %dir %{_datadir}/syslog-ng/include/scl/loadbalancer
 %attr(755,root,root) %{_datadir}/syslog-ng/include/scl/loadbalancer/gen-loadbalancer.sh
 %{_datadir}/syslog-ng/include/scl/loadbalancer/plugin.conf
-%{_datadir}/syslog-ng/include/scl/loggly
-%{_datadir}/syslog-ng/include/scl/logmatic
 %{_datadir}/syslog-ng/include/scl/mbox
 %{_datadir}/syslog-ng/include/scl/nodejs
 %{_datadir}/syslog-ng/include/scl/osquery
@@ -622,8 +611,11 @@ exit 0
 %attr(755,root,root) %{moduledir}/libjson-plugin.so
 %{_datadir}/syslog-ng/include/scl/cim
 %{_datadir}/syslog-ng/include/scl/cisco
+%{_datadir}/syslog-ng/include/scl/elasticsearch
 %{_datadir}/syslog-ng/include/scl/ewmm
 %{_datadir}/syslog-ng/include/scl/graylog2
+%{_datadir}/syslog-ng/include/scl/loggly
+%{_datadir}/syslog-ng/include/scl/logmatic
 %endif
 
 %if %{with redis}
@@ -683,14 +675,4 @@ exit 0
 %{_includedir}/syslog-ng/value-pairs
 %{_datadir}/syslog-ng/tools
 %{_pkgconfigdir}/syslog-ng.pc
-%{_pkgconfigdir}/syslog-ng-add-contextual-data.pc
 %{_pkgconfigdir}/syslog-ng-native-connector.pc
-
-# test-devel ?
-%if "%{_libdir}/syslog-ng" != "{moduledir}"
-%dir %{_libdir}/syslog-ng
-%endif
-%dir %{_libdir}/syslog-ng/libtest
-%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a
-%{_includedir}/syslog-ng/libtest
-%{_pkgconfigdir}/syslog-ng-test.pc