diff --git a/.gitignore b/.gitignore index e390fd2..5b4dfca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/libpreludedb-4.1.0.tar.gz -/libpreludedb-5.0.0.tar.gz -/libpreludedb-5.1.0.tar.gz +/libpreludedb-5.2.0.tar.gz diff --git a/libpreludedb-5.1.0-fix_py38.patch b/libpreludedb-5.1.0-fix_py38.patch deleted file mode 100644 index 3354cb1..0000000 --- a/libpreludedb-5.1.0-fix_py38.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./bindings/python/_preludedb.cxx 2019-07-13 08:39:59.744285379 +0200 -+++ ./bindings/python/_preludedb.cxx 2019-07-13 08:41:47.364117843 +0200 -@@ -3133,7 +3133,7 @@ - - SWIGINTERN void - SwigPyStaticVar_dealloc(PyDescrObject *descr) { -- _PyObject_GC_UNTRACK(descr); -+ PyObject_GC_UnTrack(descr); - Py_XDECREF(PyDescr_TYPE(descr)); - Py_XDECREF(PyDescr_NAME(descr)); - PyObject_GC_Del(descr); diff --git a/libpreludedb-5.1.0-fix_gtkdoc_1.32.patch b/libpreludedb-5.2.0-fix_gtkdoc_1.32.patch similarity index 100% rename from libpreludedb-5.1.0-fix_gtkdoc_1.32.patch rename to libpreludedb-5.2.0-fix_gtkdoc_1.32.patch diff --git a/libpreludedb-5.1.0-force_preludedb_admin_with_py3.patch b/libpreludedb-5.2.0-force_preludedb_admin_with_py3.patch similarity index 84% rename from libpreludedb-5.1.0-force_preludedb_admin_with_py3.patch rename to libpreludedb-5.2.0-force_preludedb_admin_with_py3.patch index c0ee8f3..0e502bf 100644 --- a/libpreludedb-5.1.0-force_preludedb_admin_with_py3.patch +++ b/libpreludedb-5.2.0-force_preludedb_admin_with_py3.patch @@ -8,5 +8,5 @@ Last-Update: 2019-09-20 -#!/usr/bin/env python +#!/usr/bin/env python3 # - # Copyright (C) 2019 CS-SI. All Rights Reserved. + # Copyright (C) 2019-2020 CS GROUP - France. All Rights Reserved. # Author: Yoann Vandoorselaere diff --git a/libpreludedb-5.1.0-undefined_non_weak_symbol.patch b/libpreludedb-5.2.0-undefined_non_weak_symbol.patch similarity index 100% rename from libpreludedb-5.1.0-undefined_non_weak_symbol.patch rename to libpreludedb-5.2.0-undefined_non_weak_symbol.patch diff --git a/libpreludedb-5.1.0-update_m4_postgresql.patch b/libpreludedb-5.2.0-update_m4_postgresql.patch similarity index 100% rename from libpreludedb-5.1.0-update_m4_postgresql.patch rename to libpreludedb-5.2.0-update_m4_postgresql.patch diff --git a/libpreludedb.spec b/libpreludedb.spec index 10415e8..b0112b7 100644 --- a/libpreludedb.spec +++ b/libpreludedb.spec @@ -10,8 +10,8 @@ %global cppmajor 2 Name: libpreludedb -Version: 5.1.0 -Release: 2%{?dist} +Version: 5.2.0 +Release: 1%{?dist} Summary: Framework for easy access to the IDMEF database # Prelude is GPL-2.0+ # libmissing is LGPL-2.1+ @@ -19,16 +19,15 @@ License: GPLv2+ URL: https://www.prelude-siem.org/ Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz # https://www.prelude-siem.org/issues/867 -Patch0: libpreludedb-5.1.0-undefined_non_weak_symbol.patch -Patch1: libpreludedb-5.1.0-fix_py38.patch -Patch2: libpreludedb-5.1.0-fix_gtkdoc_1.32.patch -Patch3: libpreludedb-5.1.0-force_preludedb_admin_with_py3.patch -Patch4: libpreludedb-5.1.0-update_m4_postgresql.patch +Patch0: libpreludedb-5.2.0-undefined_non_weak_symbol.patch +Patch1: libpreludedb-5.2.0-fix_gtkdoc_1.32.patch +Patch2: libpreludedb-5.2.0-force_preludedb_admin_with_py3.patch +Patch3: libpreludedb-5.2.0-update_m4_postgresql.patch +Patch4: libpreludedb-5.2.0-Clean_libpreludedb-config.patch BuildRequires: bison BuildRequires: chrpath BuildRequires: flex BuildRequires: gtk-doc -BuildRequires: swig BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: mysql-devel @@ -48,7 +47,7 @@ BuildRequires: valgrind %endif # Upstream do not use explicit version of gnulib, just checkout -# and update files. In libpreludedb 5.0.0, the checkout has been done +# and update files. In libpreludedb 5.2.0, the checkout has been done # on 2018-09-03 Provides: bundled(gnulib) = 20180903 @@ -149,7 +148,7 @@ Provides documentation for preludedb generated by gtk-doc. --disable-static \ --enable-shared \ --includedir=%{_includedir}/%{name} \ - --with-swig \ + --without-swig \ --with-python2 \ --with-python3 \ --enable-gtk-doc \ @@ -248,6 +247,9 @@ chmod +x %{buildroot}%{_datadir}/%{name}/classic/mysql2sqlite.sh %doc ChangeLog README NEWS %changelog +* Thu Sep 17 2020 Thomas Andrejak - 5.2.0-1 +- Bump version 5.2.0 + * Mon Apr 06 2020 Thomas Andrejak - 5.1.0-2 - Rebuild diff --git a/sources b/sources index 46172a9..3380b26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpreludedb-5.1.0.tar.gz) = 9e45e0f7a945eef254f8e59c0c7212c6afca897584ea8f2c88e16478fde448abdeeb991828cc2482373d2c735e1229f1a11fe9780e40da1a8aed867fe158f481 +SHA512 (libpreludedb-5.2.0.tar.gz) = 357e3ce69927ed405bc757774466631d34cad9b53031be6ce456238dd8aef3781471ecbb36ab4a3131468f4686a635095aaf837d23a0efc9db758322298e7744