commit d66059960026756d2c34d91bf1ccac07971cf4e6
Author: Jacek Konieczny <[email protected]>
Date:   Fri Mar 30 13:34:47 2018 +0200

    geoip2 bcond (requires: libmaxminddb)

 syslog-ng.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index d4d88ca..61777fa 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -18,6 +18,7 @@
 %bcond_without redis                   # support for Redis destination
 %bcond_without smtp                    # support for logging into SMTP
 %bcond_without geoip                   # support for GeoIP
+%bcond_without geoip2                  # support for GeoIP2
 %bcond_without riemann                 # support for Riemann monitoring system
 %bcond_without systemd                 # systemd (daemon and journal) support
 %bcond_without amqp                    # AMQP support
@@ -77,6 +78,7 @@ BuildRequires:        libcap-devel
 %{?with_smtp:BuildRequires:    libesmtp-devel}
 %{?with_system_libivykis:BuildRequires:        libivykis-devel >= 0.42}
 %{?with_mongodb:BuildRequires: mongo-c-driver-devel}
+%{?with_geoip2:BuildRequires:  libmaxminddb-devel}
 BuildRequires: libnet-devel >= 1:1.1.2.1-3
 BuildRequires: libtool >= 2:2.0
 BuildRequires: libwrap-devel
@@ -366,7 +368,8 @@ done
        --with-systemdsystemunitdir=%{systemdunitdir} \
        --with-timezone-dir=%{_datadir}/zoneinfo \
        %{__enable_disable amqp} \
-       --enable-geoip%{!?with_geoip:=no} \
+       %{__enable_disable geoip} \
+       %{__enable_disable geoip2} \
        --enable-http%{!?with_http:=no} \
        --enable-ipv6 \
        --enable-json%{!?with_json:=no} \
@@ -523,7 +526,9 @@ exit 0
 %attr(755,root,root) %{moduledir}/libdate.so
 %attr(755,root,root) %{moduledir}/libdbparser.so
 %attr(755,root,root) %{moduledir}/libdisk-buffer.so
+%if %{with geoip2}
 %attr(755,root,root) %{moduledir}/libgeoip2-plugin.so
+%endif
 %attr(755,root,root) %{moduledir}/libgraphite.so
 %attr(755,root,root) %{moduledir}/libkvformat.so
 %attr(755,root,root) %{moduledir}/liblinux-kmsg-format.so
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/syslog-ng.git/commitdiff/d66059960026756d2c34d91bf1ccac07971cf4e6

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to