From ec23afb635b6d41d1e4519438788cb87765570fd Mon Sep 17 00:00:00 2001 From: Thomas Andrejak Date: Mar 03 2019 23:01:37 +0000 Subject: Bump version 5.0.0 --- diff --git a/.gitignore b/.gitignore index 5022875..6f2e790 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libpreludedb-4.1.0.tar.gz +/libpreludedb-5.0.0.tar.gz diff --git a/libpreludedb-4.1.0-manpages.patch b/libpreludedb-4.1.0-manpages.patch deleted file mode 100644 index fef40b1..0000000 --- a/libpreludedb-4.1.0-manpages.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./docs/manpages/libpreludedb-config.1 2016-09-15 08:49:14.234000884 +0200 -+++ ./docs/manpages/libpreludedb-config.1 2017-01-10 08:22:39.280448484 +0100 -@@ -20,7 +20,7 @@ - .B \-\-libs - options. - This option must be specified before any --.B\-\-libs -+.B \-\-libs - or - .B \-\-cflags - options. This diff --git a/libpreludedb-4.1.0-undefined_non_weak_symbol.patch b/libpreludedb-4.1.0-undefined_non_weak_symbol.patch deleted file mode 100644 index 30b933d..0000000 --- a/libpreludedb-4.1.0-undefined_non_weak_symbol.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ./bindings/c++/Makefile.in 2016-09-15 08:59:47.230000884 +0200 -+++ ./bindings/c++/Makefile.in.n 2017-01-10 22:40:52.430934642 +0100 -@@ -986,7 +986,7 @@ - @HAVE_EASY_BINDINGS_TRUE@lib_LTLIBRARIES = libpreludedbcpp.la - @HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_ladir = ${prefix}/lib - @HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_SOURCES = preludedb.cxx preludedb-sql.cxx preludedb-error.cxx --@HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_LDFLAGS = -no-undefined -version-info @LIBPRELUDEDBCPP_SONAME@ -+@HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_LDFLAGS = -no-undefined -version-info @LIBPRELUDEDBCPP_SONAME@ @LIBPRELUDE_LDFLAGS@ @LIBPRELUDECPP_LDFLAGS@ - @HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_LIBADD = $(top_builddir)/src/.libs/libpreludedb.la - @HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/src/include -I$(top_srcdir)/src/include -I$(top_builddir)/bindings/c++/include -I$(top_srcdir)/bindings/c++/include @LIBPRELUDE_CFLAGS@ - all: all-recursive ---- ./configure 2016-09-15 08:59:45.293000884 +0200 -+++ ./configure 2017-01-11 07:17:38.116104467 +0100 -@@ -1450,6 +1450,7 @@ - LIBPRELUDE_PREFIX - LIBPRELUDE_LIBS - LIBPRELUDE_LDFLAGS -+LIBPRELUDECPP_LDFLAGS - LIBPRELUDE_PTHREAD_CFLAGS - LIBPRELUDE_CFLAGS - LIBPRELUDE_CONFIG -@@ -17062,6 +17063,7 @@ - else - LIBPRELUDE_CFLAGS=`$LIBPRELUDE_CONFIG $libprelude_config_args --cflags` - LIBPRELUDE_LDFLAGS=`$LIBPRELUDE_CONFIG $libprelude_config_args --ldflags` -+ LIBPRELUDECPP_LDFLAGS='-lpreludecpp' - LIBPRELUDE_LIBS=`$LIBPRELUDE_CONFIG $libprelude_config_args --libs` - LIBPRELUDE_PREFIX=`$LIBPRELUDE_CONFIG $libprelude_config_args --prefix` - LIBPRELUDE_CONFIG_PREFIX=`$LIBPRELUDE_CONFIG $libprelude_config_args --config-prefix` diff --git a/libpreludedb-5.0.0-manpages.patch b/libpreludedb-5.0.0-manpages.patch new file mode 100644 index 0000000..fef40b1 --- /dev/null +++ b/libpreludedb-5.0.0-manpages.patch @@ -0,0 +1,11 @@ +--- ./docs/manpages/libpreludedb-config.1 2016-09-15 08:49:14.234000884 +0200 ++++ ./docs/manpages/libpreludedb-config.1 2017-01-10 08:22:39.280448484 +0100 +@@ -20,7 +20,7 @@ + .B \-\-libs + options. + This option must be specified before any +-.B\-\-libs ++.B \-\-libs + or + .B \-\-cflags + options. This diff --git a/libpreludedb-5.0.0-undefined_non_weak_symbol.patch b/libpreludedb-5.0.0-undefined_non_weak_symbol.patch new file mode 100644 index 0000000..30b933d --- /dev/null +++ b/libpreludedb-5.0.0-undefined_non_weak_symbol.patch @@ -0,0 +1,29 @@ +--- ./bindings/c++/Makefile.in 2016-09-15 08:59:47.230000884 +0200 ++++ ./bindings/c++/Makefile.in.n 2017-01-10 22:40:52.430934642 +0100 +@@ -986,7 +986,7 @@ + @HAVE_EASY_BINDINGS_TRUE@lib_LTLIBRARIES = libpreludedbcpp.la + @HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_ladir = ${prefix}/lib + @HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_SOURCES = preludedb.cxx preludedb-sql.cxx preludedb-error.cxx +-@HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_LDFLAGS = -no-undefined -version-info @LIBPRELUDEDBCPP_SONAME@ ++@HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_LDFLAGS = -no-undefined -version-info @LIBPRELUDEDBCPP_SONAME@ @LIBPRELUDE_LDFLAGS@ @LIBPRELUDECPP_LDFLAGS@ + @HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_LIBADD = $(top_builddir)/src/.libs/libpreludedb.la + @HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/src/include -I$(top_srcdir)/src/include -I$(top_builddir)/bindings/c++/include -I$(top_srcdir)/bindings/c++/include @LIBPRELUDE_CFLAGS@ + all: all-recursive +--- ./configure 2016-09-15 08:59:45.293000884 +0200 ++++ ./configure 2017-01-11 07:17:38.116104467 +0100 +@@ -1450,6 +1450,7 @@ + LIBPRELUDE_PREFIX + LIBPRELUDE_LIBS + LIBPRELUDE_LDFLAGS ++LIBPRELUDECPP_LDFLAGS + LIBPRELUDE_PTHREAD_CFLAGS + LIBPRELUDE_CFLAGS + LIBPRELUDE_CONFIG +@@ -17062,6 +17063,7 @@ + else + LIBPRELUDE_CFLAGS=`$LIBPRELUDE_CONFIG $libprelude_config_args --cflags` + LIBPRELUDE_LDFLAGS=`$LIBPRELUDE_CONFIG $libprelude_config_args --ldflags` ++ LIBPRELUDECPP_LDFLAGS='-lpreludecpp' + LIBPRELUDE_LIBS=`$LIBPRELUDE_CONFIG $libprelude_config_args --libs` + LIBPRELUDE_PREFIX=`$LIBPRELUDE_CONFIG $libprelude_config_args --prefix` + LIBPRELUDE_CONFIG_PREFIX=`$LIBPRELUDE_CONFIG $libprelude_config_args --config-prefix` diff --git a/libpreludedb-5.0.0.tar.gz b/libpreludedb-5.0.0.tar.gz new file mode 100644 index 0000000..b41204f Binary files /dev/null and b/libpreludedb-5.0.0.tar.gz differ diff --git a/libpreludedb.spec b/libpreludedb.spec index 049a9b3..5c16a28 100644 --- a/libpreludedb.spec +++ b/libpreludedb.spec @@ -4,8 +4,8 @@ %global cppmajor 2 Name: libpreludedb -Version: 4.1.0 -Release: 5%{?dist} +Version: 5.0.0 +Release: 1%{?dist} Summary: Framework for easy access to the IDMEF database # Prelude is GPL-2.0+ # libmissing is LGPL-2.1+ @@ -13,9 +13,9 @@ 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/866 -Patch0: libpreludedb-4.1.0-manpages.patch +Patch0: libpreludedb-5.0.0-manpages.patch # https://www.prelude-siem.org/issues/867 -Patch1: libpreludedb-4.1.0-undefined_non_weak_symbol.patch +Patch1: libpreludedb-5.0.0-undefined_non_weak_symbol.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: bison @@ -45,9 +45,9 @@ Suggests: preludedb-pgsql Suggests: preludedb-sqlite3 # Upstream do not use explicit version of gnulib, just checkout -# and update files. In libprelude 4.1.0, the checkout has been done -# on 2017-07-10 -Provides: bundled(gnulib) = 20170710 +# and update files. In libprelude 5.0.0, the checkout has been done +# on 2018-09-03 +Provides: bundled(gnulib) = 20180903 %description The PreludeDB Library provides an abstraction layer upon the type and the @@ -204,6 +204,9 @@ chmod +x %{buildroot}%{_datadir}/%{name}/classic/mysql2sqlite.sh %doc ChangeLog README NEWS %changelog +* Tue Feb 26 2019 Thomas Andrejak - 5.0.0-1 +- Bump version 5.0.0 + * Sun Sep 23 2018 Thomas Andrejak - 4.1.0-5 - Remove Python2 packages diff --git a/sources b/sources index 8c6a4c6..70ffa01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpreludedb-4.1.0.tar.gz) = de1fa5106d7f34edb5a23e726c968de84bb8b10257587b6ee36276ed75ddc54f4f9539aecb7836e114eb3bfa90104dd3b5e097be0c3d12347dcbded94f293dc4 +SHA512 (libpreludedb-5.0.0.tar.gz) = 5e0a59abed2e62107ffd9532ebd7b60315239589060604a0481284e98986c92736c9a15aeab557287fa55d47424b91e29315a23c8705b8d6778aff4960e606ca