From ffc89938e93948c5cf47cbe66e63627388d05a42 Mon Sep 17 00:00:00 2001
From: My Karlsson <mk@acc.umu.se>
Date: Aug 13 2019 18:31:39 +0000
Subject: Update to version 3.22.1


---

diff --git a/.gitignore b/.gitignore
index 776bf70..731c745 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ syslog-ng_3.1.1.tar.gz
 /syslog-ng-3.19.1.tar.gz
 /syslog-ng-3.20.1.tar.gz
 /syslog-ng-3.21.1.tar.gz
+/syslog-ng-3.22.1.tar.gz
diff --git a/sources b/sources
index e2c5daf..9b384f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (syslog-ng-3.21.1.tar.gz) = 97ce2d66dc24047d55e62904a8f3bdf397ecac01c7e2035c475381ffc0b47910929691847a637826264f7d2a4dec1da00b0f2c9e836f2ed45345b2623fdd88d3
+SHA512 (syslog-ng-3.22.1.tar.gz) = 4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f
diff --git a/syslog-ng.conf b/syslog-ng.conf
index 3c361e7..951d700 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.21
+@version: 3.22
 @include "scl.conf"
 
 # syslog-ng configuration file.
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 59fe26d..fc4b6ed 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,16 +1,14 @@
 %global ivykis_ver 0.42.3
 
 %global syslog_ng_major_ver 3
-%global syslog_ng_minor_ver 21
+%global syslog_ng_minor_ver 22
 %global syslog_ng_patch_ver 1
 %global syslog_ng_major_minor_ver %{syslog_ng_major_ver}.%{syslog_ng_minor_ver}
 %global syslog_ng_ver %{syslog_ng_major_ver}.%{syslog_ng_minor_ver}.%{syslog_ng_patch_ver}
 
-%global __provides_exclude_from ^%{_libdir}/syslog-ng/.*\\.so$
-
 Name:    syslog-ng
 Version: %{syslog_ng_ver}
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: Next-generation syslog server
 
 License: GPLv2+
@@ -24,7 +22,7 @@ BuildRequires: bison
 BuildRequires: cyrus-sasl-devel
 BuildRequires: flex
 BuildRequires: GeoIP-devel
-BuildRequires: glib2-devel >= 2.10.1
+BuildRequires: glib2-devel
 BuildRequires: hiredis-devel
 BuildRequires: ivykis-devel >= %{ivykis_ver}
 BuildRequires: java-devel
@@ -41,7 +39,7 @@ BuildRequires: libuuid-devel
 BuildRequires: libxslt
 BuildRequires: mongo-c-driver-devel
 BuildRequires: openssl-devel
-BuildRequires: pcre-devel >= 6.1
+BuildRequires: pcre-devel
 BuildRequires: perl-generators
 BuildRequires: pkgconfig
 BuildRequires: python3-devel
@@ -68,6 +66,8 @@ Conflicts: filesystem < 3
 
 Obsoletes: syslog-ng-json < 3.8
 
+%global __provides_exclude_from ^%{_libdir}/syslog-ng/.*\\.so$
+
 
 %description
 syslog-ng is an enhanced log daemon, supporting a wide range of input and
@@ -163,20 +163,12 @@ This module supports the AMQP destination.
 %package python
 Summary: Python support for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: python3-%{name} = %{version}-%{release}
+Obsoletes: python3-syslog-ng < 3.22
 
 %description python
 This module supports the Python destination.
 
 
-%package -n python3-%{name}
-Summary: Python extensions used by %{name}
-
-%description -n python3-%{name}
-This package contains the Python extensions used by the %{name}
-Python module.
-
-
 %package devel
 Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -210,13 +202,12 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" lib/merge-grammar.py
 
 %build
 export GEOIP_LIBS=-lGeoIP
-export PYTHON=%{__python3}
 %configure \
     --prefix=%{_prefix} \
     --sysconfdir=%{_sysconfdir}/%{name} \
     --localstatedir=%{_sharedstatedir}/%{name} \
     --datadir=%{_datadir} \
-    --with-module-dir=/%{_libdir}/%{name} \
+    --with-module-dir=%{_libdir}/%{name} \
     --with-systemdsystemunitdir=%{_unitdir} \
     --with-ivykis=system \
     --with-mongoc=system \
@@ -236,7 +227,8 @@ export PYTHON=%{__python3}
     --enable-systemd \
     --enable-redis \
     --enable-amqp \
-    --enable-python=3 \
+    --enable-python \
+    --with-python=3 \
     --enable-java \
     --disable-java-modules \
     --enable-riemann
@@ -438,11 +430,7 @@ fi
 
 %files python
 %{_libdir}/syslog-ng/libmod-python.so
-
-
-%files -n python3-%{name}
-%{python3_sitelib}/syslogng/
-%{python3_sitelib}/syslogng-*.egg-info
+%{_libdir}/syslog-ng/python/
 
 
 %files devel
@@ -459,6 +447,9 @@ fi
 
 
 %changelog
+* Tue Aug 13 2019 My Karlsson <mk@acc.umu.se> - 3.22.1-1
+- Update to version 3.22.1
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.21.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild