Compare commits

...

5 Commits

Author SHA1 Message Date
Troy Dawson bc14ad5f8c remove package.cfg per new epel-playground policy 2020-09-24 18:15:50 +00:00
Peter Czanik 95fb2010f8 fix MaxMindDB (GeoIP) packaging (make it a sub-package again)
fix file conflicit between rsyslog and syslog-ng: /etc/logrotate.d/syslog
  see: https://bugzilla.redhat.com/show_bug.cgi?id=1802165
  It became a weak dependency which conflicts with rsyslog
2020-07-02 15:27:31 +02:00
Gwyn Ciesla dcd1d71563 Drop GeoIP for EL-8 2019-10-20 11:39:05 -04:00
Gwyn Ciesla 7c23e5cb6f Merge branch 'master' into epel8 2019-10-20 11:38:30 -04:00
Gwyn Ciesla c6d12922bd "Adding package.cfg file" 2019-10-20 10:34:25 -05:00
1 changed files with 26 additions and 15 deletions

View File

@ -8,11 +8,11 @@
Name: syslog-ng
Version: %{syslog_ng_ver}
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Next-generation syslog server
License: GPLv2+
URL: https://syslog-ng.org/
URL: https://syslog-ng.com/
Source0: https://github.com/balabit/syslog-ng/releases/download/syslog-ng-%{version}/%{name}-%{version}.tar.gz
Source1: syslog-ng.conf
Source2: syslog-ng.logrotate
@ -21,7 +21,6 @@ Source3: syslog-ng.service
BuildRequires: bison
BuildRequires: cyrus-sasl-devel
BuildRequires: flex
BuildRequires: GeoIP-devel
BuildRequires: glib2-devel
BuildRequires: hiredis-devel
BuildRequires: ivykis-devel >= %{ivykis_ver}
@ -51,6 +50,7 @@ BuildRequires: systemd-units
BuildRequires: /usr/bin/pathfix.py
Requires: logrotate
Recommends: syslog-ng-logrotate
Requires: ivykis >= %{ivykis_ver}
Requires(post): systemd-units
Requires(preun): systemd-units
@ -117,14 +117,13 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description java
This package provides java destination support for syslog-ng.
%package geoip
Summary: GeoIP support for %{name}
Summary: MaxMindDB (GeoIP) support for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description geoip
This template function returns the 2-letter country code of
any IPv4 address or host.
This package provides MaxMindDB (GeoIP) support for syslog-ng
%package redis
@ -177,6 +176,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package logrotate
Summary: Logrotate script for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Conflicts: rsyslog
%description logrotate
This package provides a logrotate script for syslog-ng. It is only installed if
ryslog is not on the system.
%prep
%autosetup -p 1
@ -201,7 +209,6 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" lib/merge-grammar.py
%build
export GEOIP_LIBS=-lGeoIP
%configure \
--prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir}/%{name} \
@ -220,13 +227,13 @@ export GEOIP_LIBS=-lGeoIP
--enable-json \
--enable-ssl \
--enable-smtp \
--enable-geoip \
--enable-shared \
--disable-static \
--enable-dynamic-linking \
--enable-systemd \
--enable-redis \
--enable-amqp \
--enable-geoip2 \
--enable-python \
--with-python=3 \
--enable-java \
@ -322,7 +329,6 @@ fi
%dir %{_sysconfdir}/syslog-ng
%dir %{_sysconfdir}/syslog-ng/conf.d
%dir %{_sysconfdir}/syslog-ng/patterndb.d
%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
%config(noreplace) %{_sysconfdir}/syslog-ng/scl.conf
%config(noreplace) %{_sysconfdir}/syslog-ng/syslog-ng.conf
@ -363,7 +369,6 @@ fi
%exclude %{_libdir}/syslog-ng/libafsmtp.so
%exclude %{_libdir}/syslog-ng/libafsql.so
%exclude %{_libdir}/syslog-ng/libgeoip2-plugin.so
%exclude %{_libdir}/syslog-ng/libgeoip-plugin.so
%exclude %{_libdir}/syslog-ng/libhttp.so
%exclude %{_libdir}/syslog-ng/libmod-java.so
%exclude %{_libdir}/syslog-ng/libmod-python.so
@ -410,11 +415,8 @@ fi
%dir %{_libdir}/syslog-ng/java-modules/
%{_libdir}/syslog-ng/java-modules/*
%files geoip
%{_libdir}/syslog-ng/libgeoip-plugin.so
%{_libdir}/syslog-ng/libgeoip2-plugin.so
%{_libdir}/%{name}/libgeoip2-plugin.so
%files riemann
%{_libdir}/syslog-ng/libriemann.so
@ -445,8 +447,17 @@ fi
%{_libdir}/pkgconfig/syslog-ng-native-connector.pc
%{_libdir}/pkgconfig/syslog-ng.pc
%files logrotate
%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
%changelog
* Tue Jun 30 2020 Peter Czanik <peter@czanik.hu> - 3.23.1-2
- fix MaxMindDB (GeoIP) packaging (make it a sub-package again)
- fix file conflicit between rsyslog and syslog-ng: /etc/logrotate.d/syslog
see: https://bugzilla.redhat.com/show_bug.cgi?id=1802165
It became a weak dependency which conflicts with rsyslog
* Sun Sep 01 2019 My Karlsson <mk@acc.umu.se> - 3.23.1-1
- Update to version 3.23.1