Compare commits

...

82 Commits
f7 ... rawhide

Author SHA1 Message Date
Fedora Release Engineering
268b770cfa Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 17:12:04 +00:00
Fedora Release Engineering
a631d644f5 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 18:43:25 +00:00
Python Maint
a9d8fd60a0 Rebuilt for Python 3.11 2022-06-13 17:13:34 +02:00
Fedora Release Engineering
0bbe4a9205 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 17:00:40 +00:00
Fedora Release Engineering
540d28794e - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 12:08:35 +00:00
Python Maint
0d2f25575c Rebuilt for Python 3.10 2021-06-04 20:09:50 +02:00
Pavel Raiskup
21805d8b8b rebuild for libpq ABI fix
Related: rhbz#1908268
2021-02-08 09:30:06 +01:00
Fedora Release Engineering
0534ee8dec - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 17:47:42 +00:00
Tom Stellard
562f920025 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-06 02:25:07 +00:00
Thomas Andrejak
d1b0e1480b Fix libprelude-config 2020-09-21 11:10:50 +02:00
Thomas Andrejak
edf01c47b8 Clean libpreludedb-config 2020-09-20 23:54:36 +02:00
Thomas Andrejak
5e0f8f761e Fix Release in .spec 2020-09-19 09:28:28 +02:00
Thomas Andrejak
26763b2bdf Bump version 5.2.0 2020-09-18 17:09:33 +02:00
Fedora Release Engineering
8d4d899023 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 05:22:42 +00:00
Miro Hrončok
325e49aecb Replace Python version glob with macro (needed for Python 3.10+)
See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/PQIGCQCRNBYNXBX2ICWEM3PLDLNOG2ZT/

Co-authored-by: Tomas Hrnciar <thrnciar@redhat.com>
2020-07-13 21:04:23 +02:00
Miro Hrončok
5333a68ddf Rebuilt for Python 3.9 2020-05-26 02:51:07 +02:00
Fedora Release Engineering
b6c4386765 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 10:06:27 +00:00
Thomas Andrejak
ccb9eb72b3 Add missing patches 2019-11-10 13:32:22 +01:00
Thomas Andrejak
98bc27bca2 Bump version 5.1.0 2019-11-10 01:42:59 +01:00
Miro Hrončok
12885efdd8 Rebuilt for Python 3.8.0rc1 (#1748018) 2019-10-03 13:55:57 +02:00
Miro Hrončok
1f69b86570 Rebuilt for Python 3.8 2019-08-19 10:18:23 +02:00
Fedora Release Engineering
ae8daacc3c - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 14:10:16 +00:00
Thomas Andrejak
099aec879b Fix FTBFS with Python 3.8 (#1706207) 2019-07-13 09:21:00 +02:00
Thomas Andrejak
7766bf36b8 Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/libpreludedb 2019-03-04 00:03:27 +01:00
Thomas Andrejak
ec23afb635 Bump version 5.0.0 2019-03-04 00:01:37 +01:00
Fedora Release Engineering
fa66cf3896 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 08:00:10 +00:00
Igor Gnatenko
9d9428eb64
Remove obsolete ldconfig scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-22 18:40:02 +01:00
Thomas Andrejak
f129ebfe82 Remove Python2 package
https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal

Also disable test, need to fix #1629893 before enable again
2018-09-23 17:23:31 +02:00
Pavel Raiskup
df7e073fac BuildRequires: s/postgresql-devel/libpq-devel/
That's because we moved libpq.so.5 into libpq package.

Related: rhbz#1618698, rhbz#1623764
2018-09-06 08:53:59 +02:00
Thomas Andrejak
404f8049aa Fix FTBFS, #1604644 2018-07-24 23:30:12 +02:00
Fedora Release Engineering
252ca7322b - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 08:41:00 +00:00
Igor Gnatenko
87c7d47c3a add BuildRequires: gcc
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-09 19:06:48 +02:00
Miro Hrončok
2b8b3dd6e5 Rebuilt for Python 3.7 2018-06-19 10:46:19 +02:00
Thomas Andrejak
a06a8306c4 Bump version 4.1.0 2018-03-22 23:56:44 +01:00
Fedora Release Engineering
5951c17533 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 23:04:56 +00:00
Thomas Andrejak
bfb6c9c292 Bump version 4.0.0 2017-09-23 23:49:08 +02:00
Fedora Release Engineering
afc182bb82 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 02:06:30 +00:00
Fedora Release Engineering
538ec6adab - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 19:33:09 +00:00
Fedora Release Engineering
3ecbcb3896 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 19:18:08 +00:00
Thomas Andrejak
6ce3e64d1a Upload tarball 2017-01-15 00:17:10 +01:00
Thomas Andrejak
56dc07e9b8 Initial import (#1412128) 2017-01-14 12:36:16 +01:00
Steve
f3b37ea39b Upstream has been dead for over a year 2013-07-08 10:14:22 -04:00
Steve
22f012d29e Add -i to autoreconf to add missing test-driver
- Add libtool as build dependency
2013-03-10 10:48:02 -04:00
Steve
eea2e94bb6 Add -i to autoreconf to add missing test-driver 2013-03-10 10:26:52 -04:00
Dennis Gilmore
7fb3be7f06 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-13 23:06:37 -06:00
Steve
bdcaa7e2be Add provides bundled gnulib 2012-09-06 09:36:46 -04:00
Petr Písař
86ed2bd0d6 Fix building with glibc-2.16.6 2012-08-08 14:45:37 +02:00
Dennis Gilmore
3bd2e5b0b4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-19 15:55:50 -05:00
Petr Písař
3b1b1df8b9 Perl 5.16 rebuild 2012-06-10 22:57:55 +02:00
Dennis Gilmore
e6d13301b2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-13 02:18:46 -06:00
Marcela Mašláňová
d34f598755 Perl mass rebuild 2011-06-17 21:13:46 +02:00
Marcela Mašláňová
4e4dda6322 Perl 5.14 mass rebuild 2011-06-10 13:33:36 +02:00
Dan Horák
773c06c531 rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) 2011-03-23 19:27:02 +01:00
Dennis Gilmore
9be375a254 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-09 14:45:08 -06:00
Fedora Release Engineering
e216014edb dist-git conversion 2010-07-28 21:29:51 +00:00
dmalcolm
9071d0b9fd - Rebuilt for
https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
2010-07-22 02:17:07 +00:00
Marcela Mašláňová
2d08b9ffcd - Mass rebuild with perl-5.12.0 2010-06-01 18:37:14 +00:00
Steve Grubb
0a168fb694 - Fix requires 2010-05-02 13:34:58 +00:00
Steve Grubb
4467902987 - new upstream release 2010-04-30 17:30:36 +00:00
Steve Grubb
16b4cca874 - new upstream release 2010-03-22 18:44:40 +00:00
Steve Grubb
e6fe9d500e - new upstream bugfix release 2010-01-30 14:34:39 +00:00
Steve Grubb
5a2fac8ac1 - new upstream bugfix release 2009-12-17 20:46:11 +00:00
Štěpán Kasal
f0fe591307 - rebuild against perl 5.10.1 2009-12-07 18:19:12 +00:00
Bill Nottingham
bc27d5813b Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 23:51:13 +00:00
Steve Grubb
6d0889f35c - rebuild for new openssl 2009-08-25 15:59:49 +00:00
Steve Grubb
e532028c03 Revert upgraded release 2009-08-25 15:55:08 +00:00
Steve Grubb
926546f961 revert upgraded version 2009-08-25 15:54:19 +00:00
Tomáš Mráz
46b8db5f9e - rebuilt with new openssl 2009-08-21 14:21:11 +00:00
Jesse Keating
dc1de45cd5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild 2009-07-25 08:28:48 +00:00
Steve Grubb
0e2431a050 - new upstream bugfix release 2009-07-13 14:37:48 +00:00
Jesse Keating
a92945a676 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild 2009-02-25 17:36:09 +00:00
Caolan McNamara
4eaed0e512 rebuild for dependencies 2009-01-24 16:55:40 +00:00
Ignacio Vazquez-Abrams
cde53f3f4f Rebuild for Python 2.6 2008-11-29 16:48:04 +00:00
Steve Grubb
a1bde8732b - new upstream bugfix release 2008-09-14 12:11:15 +00:00
Steve Grubb
a2f3f8d2c9 - new upstream release 2008-08-27 20:51:55 +00:00
Steve Grubb
365dcca612 - Fix perl bindings (#453935) 2008-07-04 17:33:33 +00:00
Tomáš Mráz
ca86c3da7d - fix install of perl bindings 2008-06-25 16:26:57 +00:00
Tomáš Mráz
12b8487be4 - rebuild with new gnutls 2008-06-25 12:22:37 +00:00
Jesse Keating
5d483dc0c6 - Autorebuild for GCC 4.3 2008-02-20 05:54:26 +00:00
Steve Grubb
ec5dfe3baf - new upstream version 0.9.14.1 2008-01-14 20:43:27 +00:00
alexlan
3270ca8c9f - Add missing BR: perl-devel 2007-12-09 09:43:35 +00:00
Jesse Keating
b365b98297 - Rebuild for deps 2007-12-06 19:48:27 +00:00
15 changed files with 1345 additions and 197 deletions

View File

@ -1 +0,0 @@
libpreludedb-0.9.11.1.tar.gz

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/libpreludedb-5.2.0.tar.gz

View File

@ -1,21 +0,0 @@
# Makefile for source rpm: libpreludedb
# $Id$
NAME := libpreludedb
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

View File

@ -0,0 +1,282 @@
Description: Add pkg-config file
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
Last-Update: Mon, 14 Aug 2017
---
configure.ac | 1 +
m4/pkg.m4 | 199 +++++++++++++++++++++++++++++++++++++++++++++++++
src/Makefile.am | 5 +-
src/libpreludedb.pc.in | 13 ++++
4 files changed, 217 insertions(+), 1 deletion(-)
create mode 100644 m4/pkg.m4
create mode 100644 src/libpreludedb.pc.in
diff --git a/configure.ac b/configure.ac
index 9c7e026..f589aa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -333,6 +333,12 @@
AC_SUBST(sql_plugin_dir)
AC_SUBST(format_plugin_dir)
AC_SUBST(format_schema_dir)
+
+AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
+AC_SUBST(LIBPRELUDEDB_LIBS)
+AC_SUBST(LIBPRELUDEDB_CFLAGS)
AC_SUBST(LIBPRELUDEDB_VERSION)
AC_SUBST(LIBPRELUDEDB_MAJOR_VERSION)
AC_SUBST(LIBPRELUDEDB_MINOR_VERSION)
@@ -350,6 +350,7 @@ libmissing/Makefile
libmissing/tests/Makefile
src/Makefile
+src/libpreludedb.pc
src/include/Makefile
src/include/preludedb-version.h
diff --git a/m4/pkg.m4 b/m4/pkg.m4
new file mode 100644
index 0000000..f26f84c
--- /dev/null
+++ b/m4/pkg.m4
@@ -0,0 +1,199 @@
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+#
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_default([$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+ ])
+elif test $pkg_failed = untried; then
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+ ])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ $3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b9accd..80df82c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,8 +31,11 @@ AM_YFLAGS = -d
AM_LFLAGS = --header-file=preludedb-path-selection-parser.lex.h
LEX_OUTPUT_ROOT = lex._preludedbyy
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libpreludedb.pc
+
noinst_HEADERS = preludedb-path-selection-parser.lex.h
-DISTCLEANFILES = preludedb-path-selection-parser.lex.h preludedb-path-selection-parser.lex.c preludedb-path-selection-parser.yac.h preludedb-path-selection-parser.yac.c
+DISTCLEANFILES = $(pkgconfig_DATA) preludedb-path-selection-parser.lex.h preludedb-path-selection-parser.lex.c preludedb-path-selection-parser.yac.h preludedb-path-selection-parser.yac.c
libpreludedb_la_SOURCES = \
diff --git a/src/libpreludedb.pc.in b/src/libpreludedb.pc.in
new file mode 100644
index 0000000..63eb32f
--- /dev/null
+++ b/src/libpreludedb.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+threadlib=@LIBMULTITHREAD@
+
+Name: LibPreludeDB
+Description: The Prelude DB Library provide API for accessing IDMEF alerts.
+Version: @VERSION@
+Libs: -L${libdir} -lpreludedb
+Libs.private: @LIBPRELUDEDB_LIBS@ @LIBMULTITHREAD@
+Cflags: @LIBPRELUDEDB_CFLAGS@
--
2.13.3

View File

@ -0,0 +1,50 @@
Description: Clean libpreludedb-config
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
Last-Update: 2020-09-20
--- a/libpreludedb-config.in 2020-09-09 16:36:50.110000000 +0200
+++ b/libpreludedb-config.in 2020-09-20 23:30:02.097649400 +0200
@@ -3,6 +3,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
+cpp_set=no
want_cflags=no
want_libs=no
thread_set=no
@@ -54,6 +55,10 @@
echo @LIBPRELUDE_LDFLAGS@
;;
+ --c++)
+ cpp_set=yes
+ ;;
+
--libs)
want_libs=yes
;;
@@ -90,7 +95,14 @@
if test $want_libs = yes; then
- libdirs=-L@libdir@
+ libdirs=
+ if test @libdir@ != /usr/lib -a @libdir@ != /usr/lib64 ; then
+ libdirs=-L@libdir@
+ fi
+ cpplibs=""
+ if test $cpp_set = yes; then
+ cpplibs="-lpreludedbcpp"
+ fi
if test $thread_set = yes; then
thrlibs=@LTLIBMULTITHREAD@
@@ -98,7 +110,7 @@
thrlibs=@LTLIBTHREAD@
fi
- echo $libdirs -lpreludedb @LIBPRELUDE_LIBS@ $thrlibs
+ echo $cpplibs $libdirs -lpreludedb $thrlibs
fi
exit 0

View File

@ -0,0 +1,20 @@
Description: Fix test-rwlock1 when --as-needed is the default.
Author: Michael Hudson-Doyle <michael.hudson@ubuntu.com>
Forwarded: no
Last-Update: 2018-07-25
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/libmissing/tests/test-rwlock1.c
+++ b/libmissing/tests/test-rwlock1.c
@@ -54,7 +54,10 @@
#define SUCCEED() exit (0)
#define FAILURE() exit (1)
-#define UNEXPECTED(n) (fprintf (stderr, "Unexpected outcome %d\n", n), abort ())
+/* The pointless reference to errno below is to ensure that the test binary
+ * gets a DT_NEEDED for libpthread even if the link is done with --as-needed
+ * (which is the default in Ubuntu) */
+#define UNEXPECTED(n) (fprintf (stderr, "Unexpected outcome %d errno %d\n", n, errno), abort ())
/* The main thread creates the waiting writer and the requesting reader threads
in the default way; this guarantees that they have the same priority.

View File

@ -0,0 +1,17 @@
Description: Fix building with gtk-doc 1.32
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
Last-Update: 2019-09-13
--- a/docs/api/libpreludedb-docs.xml 2019-09-17 18:49:45.721227852 -0400
+++ b/docs/api/libpreludedb-docs.xml2 2019-09-30 04:06:36.973341933 -0400
@@ -26,10 +26,6 @@
<xi:include href="xml/preludedb-sql-settings.xml"/>
</chapter>
- <chapter id="object-tree">
- <title>Object Hierarchy</title>
- <xi:include href="xml/tree_index.sgml"/>
- </chapter>
<index id="api-index-full">
<title>API Index</title>
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>

View File

@ -0,0 +1,11 @@
--- ./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);

View File

@ -0,0 +1,15 @@
Description: Fix libmissing thread create test
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
Last-Update: 2019-10-11
--- a/libmissing/tests/test-thread_create.c 2019-09-17 19:29:40.129501083 -0400
+++ b/libmissing/tests/test-thread_create.c 2019-10-11 17:32:48.182372602 -0400
@@ -68,7 +68,7 @@
else
{
#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WINDOWS_THREADS
- fputs ("glthread_create failed\n", stderr);
+ fprintf (stderr, "glthread_create failed with errno %d\n", errno);
return 1;
#else
fputs ("Skipping test: multithreading not enabled\n", stderr);

View File

@ -0,0 +1,12 @@
Description: Force preludedb-admin to use python3
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
Last-Update: 2019-09-20
--- a/preludedb-admin 2019-09-17 19:29:40.157500525 -0400
+++ b/preludedb-admin 2019-09-22 08:41:53.217541434 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2019-2020 CS GROUP - France. All Rights Reserved.
# Author: Yoann Vandoorselaere <yoannv@gmail.com>

View File

@ -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`

View File

@ -0,0 +1,548 @@
Description: Update m4/ax_lib_postgresql.m4 #892868
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
Last-Update: 2019-09-20
--- a/m4/ax_lib_postgresql.m4 2019-09-17 18:49:46.185218603 -0400
+++ b/m4/ax_lib_postgresql.m4 2019-09-22 09:09:22.356777373 -0400
@@ -1,10 +1,10 @@
# ===========================================================================
-# http://www.gnu.org/software/autoconf-archive/ax_lib_postgresql.html
+# https://www.gnu.org/software/autoconf-archive/ax_lib_postgresql.html
# ===========================================================================
#
# SYNOPSIS
#
-# AX_LIB_POSTGRESQL([MINIMUM-VERSION])
+# AX_LIB_POSTGRESQL([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
#
# DESCRIPTION
#
@@ -23,133 +23,225 @@
# should be in the PATH)
#
# path - complete path to pg_config utility, use this option if pg_config
-# can't be found in the PATH
+# can't be found in the PATH (You could set also PG_CONFIG variable)
#
# This macro calls:
#
-# AC_SUBST(POSTGRESQL_CFLAGS)
+# AC_SUBST(POSTGRESQL_CPPFLAGS)
# AC_SUBST(POSTGRESQL_LDFLAGS)
+# AC_SUBST(POSTGRESQL_LIBS)
# AC_SUBST(POSTGRESQL_VERSION)
#
# And sets:
#
# HAVE_POSTGRESQL
#
+# It execute if found ACTION-IF-FOUND (empty by default) and
+# ACTION-IF-NOT-FOUND (AC_MSG_FAILURE by default) if not found.
+#
# LICENSE
#
# Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (c) 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
+# Copyright (c) 2018 Bastien Roucaries <rouca@debian.org>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 9
+#serial 22
+
+AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
+ found_postgresql="no"
+ _AX_LIB_POSTGRESQL_OLD_fail="no"
+ while true; do
+ AC_CACHE_CHECK([for the pg_config program], [ac_cv_path_PG_CONFIG],
+ [AC_PATH_PROGS_FEATURE_CHECK([PG_CONFIG], [pg_config],
+ [[ac_cv_path_PG_CONFIG="";$ac_path_PG_CONFIG --includedir > /dev/null \
+ && ac_cv_path_PG_CONFIG=$ac_path_PG_CONFIG ac_path_PG_CONFIG_found=:]],
+ [ac_cv_path_PG_CONFIG=""])])
+ PG_CONFIG=$ac_cv_path_PG_CONFIG
+ AS_IF([test "X$PG_CONFIG" = "X"],[break])
+
+ AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS],
+ [ac_cv_POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
+ POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS"
+
+ AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS],
+ [ac_cv_POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
+ POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
+
+ AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS],
+ [ac_cv_POSTGRESQL_LIBS="-lpq"])
+ POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
+
+ AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
+ [
+ ac_cv_POSTGRESQL_VERSION=`$PG_CONFIG --version | sed "s/^PostgreSQL[[[:space:]]][[[:space:]]]*\([[0-9.]][[0-9.]]*\).*/\1/"` \
+ || _AX_LIB_POSTGRESQL_OLD_fail=yes
+ ])
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
+ POSTGRESQL_VERSION="$ac_cv_POSTGRESQL_VERSION"
+
+
+ dnl
+ dnl Check if required version of PostgreSQL is available
+ dnl
+ AS_IF([test X"$postgresql_version_req" != "X"],[
+ AC_MSG_CHECKING([if PostgreSQL version $POSTGRESQL_VERSION is >= $postgresql_version_req])
+ AX_COMPARE_VERSION([$POSTGRESQL_VERSION],[ge],[$postgresql_version_req],
+ [found_postgresql_req_version=yes],[found_postgresql_req_version=no])
+ AC_MSG_RESULT([$found_postgresql_req_version])
+ ])
+ AS_IF([test "Xfound_postgresql_req_version" = "Xno"],[break])
+
+ found_postgresql="yes"
+ break
+ done
+])
+
+AC_DEFUN([_AX_LIB_POSTGRESQL_PKG_CONFIG],
+[
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+ found_postgresql=no
+
+ while true; do
+ PKG_PROG_PKG_CONFIG
+ AS_IF([test X$PKG_CONFIG = X],[break])
+
+ _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=no;
+ AS_IF([test "X$postgresql_version_req" = "X"],
+ [PKG_CHECK_EXISTS([libpq],[found_postgresql_pkg_config=yes],[found_postgresql=no])],
+ [PKG_CHECK_EXISTS([libpq >= "$postgresql_version_req"],
+ [found_postgresql=yes],[found_postgresql=no])])
+ AS_IF([test "X$found_postgresql" = "no"],[break])
+
+ AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS],
+ [ac_cv_POSTGRESQL_CPPFLAGS="`$PKG_CONFIG libpq --cflags-only-I`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
+ POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS"
+
+
+ AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS],
+ [ac_cv_POSTGRESQL_LDFLAGS="`$PKG_CONFIG libpq --libs-only-L --libs-only-other`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
+ POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
+
+
+ AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS],
+ [ac_cv_POSTGRESQL_LIBS="`$PKG_CONFIG libpq --libs-only-l`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=ye])
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
+ POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
+
+ dnl already checked by exist but need to be recovered
+ AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
+ [ac_cv_POSTGRESQL_VERSION="`$PKG_CONFIG libpq --modversion`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
+ POSTGRESQL_VERSION="$ac_cv_POSTGRESQL_VERSION"
+
+ found_postgresql=yes
+ break;
+ done
+
+])
+
+
AC_DEFUN([AX_LIB_POSTGRESQL],
[
AC_ARG_WITH([postgresql],
- AS_HELP_STRING([--with-postgresql=@<:@ARG@:>@],
- [use PostgreSQL library @<:@default=yes@:>@, optionally specify path to pg_config]
- ),
- [
- if test "$withval" = "no"; then
- want_postgresql="no"
- elif test "$withval" = "yes"; then
- want_postgresql="yes"
- else
- want_postgresql="yes"
- PG_CONFIG="$withval"
- fi
- ],
- [want_postgresql="yes"]
+ AS_HELP_STRING([--with-postgresql=@<:@ARG@:>@],
+ [use PostgreSQL library @<:@default=yes@:>@, optionally specify path to pg_config]
+ ),
+ [
+ AS_CASE([$withval],
+ [[[nN]][[oO]]],[want_postgresql="no"],
+ [[[yY]][[eE]][[sS]]],[want_postgresql="yes"],
+ [
+ want_postgresql="yes"
+ PG_CONFIG="$withval"
+ ])
+ ],
+ [want_postgresql="yes"]
)
- POSTGRESQL_CFLAGS=""
- POSTGRESQL_LDFLAGS=""
- POSTGRESQL_VERSION=""
+ AC_ARG_VAR([POSTGRESQL_CPPFLAGS],[cpp flags for PostgreSQL overriding detected flags])
+ AC_ARG_VAR([POSTGRESQL_LIBFLAGS],[libs for PostgreSQL overriding detected flags])
+ AC_ARG_VAR([POSTGRESQL_LDFLAGS],[linker flags for PostgreSQL overriding detected flags])
+
+ # populate cache
+ AS_IF([test "X$POSTGRESQL_CPPFLAGS" != X],[ac_cv_POSTGRESQL_CPPFLAGS="$POSTGRESQL_CPPFLAGS"])
+ AS_IF([test "X$POSTGRESQL_LDFLAGS" != X],[ac_cv_POSTGRESQL_LDFLAGS="$POSTGRESQL_LDFLAGS"])
+ AS_IF([test "X$POSTGRESQL_LIBS" != X],[ac_cv_POSTGRESQL_LIBS="$POSTGRESQL_LIBS"])
- dnl
- dnl Check PostgreSQL libraries (libpq)
- dnl
+ postgresql_version_req=ifelse([$1], [], [], [$1])
+ found_postgresql="no"
- if test "$want_postgresql" = "yes"; then
- AC_MSG_CHECKING([for $PG_CONFIG])
- if test -z "$PG_CONFIG" -o test; then
- AC_PATH_PROG([PG_CONFIG], [pg_config], [])
- fi
-
- if test ! -x "$PG_CONFIG"; then
- AC_MSG_RESULT([$PG_CONFIG does not exist or it is not an exectuable file])
- PG_CONFIG="no"
- found_postgresql="no"
- fi
-
- if test "$PG_CONFIG" != "no"; then
- AC_MSG_CHECKING([for PostgreSQL libraries])
-
- POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`"
- POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq"
-
- POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'`
-
- AC_DEFINE([HAVE_POSTGRESQL], [1],
- [Define to 1 if PostgreSQL libraries are available])
-
- found_postgresql="yes"
- AC_MSG_RESULT([yes])
- else
- found_postgresql="no"
- AC_MSG_RESULT([no])
- fi
- fi
+ POSTGRESQL_VERSION=""
dnl
- dnl Check if required version of PostgreSQL is available
+ dnl Check PostgreSQL libraries (libpq)
dnl
+ AS_IF([test X"$want_postgresql" = "Xyes"],[
+ _AX_LIB_POSTGRESQL_PKG_CONFIG
- postgresql_version_req=ifelse([$1], [], [], [$1])
-
- if test "$found_postgresql" = "yes" -a -n "$postgresql_version_req"; then
-
- AC_MSG_CHECKING([if PostgreSQL version is >= $postgresql_version_req])
+ AS_IF([test X"$found_postgresql" = "Xno"],
+ [_AX_LIB_POSTGRESQL_OLD])
- dnl Decompose required version string of PostgreSQL
- dnl and calculate its number representation
- postgresql_version_req_major=`expr $postgresql_version_req : '\([[0-9]]*\)'`
- postgresql_version_req_minor=`expr $postgresql_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
- postgresql_version_req_micro=`expr $postgresql_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
- if test "x$postgresql_version_req_micro" = "x"; then
- postgresql_version_req_micro="0"
- fi
-
- postgresql_version_req_number=`expr $postgresql_version_req_major \* 1000000 \
- \+ $postgresql_version_req_minor \* 1000 \
- \+ $postgresql_version_req_micro`
-
- dnl Decompose version string of installed PostgreSQL
- dnl and calculate its number representation
- postgresql_version_major=`expr $POSTGRESQL_VERSION : '\([[0-9]]*\)'`
- postgresql_version_minor=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
- postgresql_version_micro=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
- if test "x$postgresql_version_micro" = "x"; then
- postgresql_version_micro="0"
- fi
-
- postgresql_version_number=`expr $postgresql_version_major \* 1000000 \
- \+ $postgresql_version_minor \* 1000 \
- \+ $postgresql_version_micro`
-
- postgresql_version_check=`expr $postgresql_version_number \>\= $postgresql_version_req_number`
- if test "$postgresql_version_check" = "1"; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- fi
- fi
+ AS_IF([test X"$found_postgresql" = Xyes],[
+ _AX_LIB_POSTGRESQL_OLD_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
+ _AX_LIB_POSTGRESQL_OLD_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS"
+ _AX_LIB_POSTGRESQL_OLD_LIBS="$LIBS"
+ LIBS="$LIBS $POSTGRESQL_LIBS"
+ while true; do
+ dnl try to compile
+ AC_CHECK_HEADER([libpq-fe.h],[],[found_postgresql=no])
+ AS_IF([test "X$found_postgresql" = "Xno"],[break])
+ dnl try now to link
+ AC_CACHE_CHECK([for the PostgreSQL library linking is working],[ac_cv_postgresql_found],
+ [
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM(
+ [
+ #include <libpq-fe.h>
+ ],
+ [[
+ char conninfo[]="dbname = postgres";
+ PGconn *conn;
+ conn = PQconnectdb(conninfo);
+ ]]
+ )
+ ],[ac_cv_postgresql_found=yes],
+ [ac_cv_postgresql_found=no])
+ ])
+ found_postgresql="$ac_cv_postgresql_found"
+ AS_IF([test "X$found_postgresql" = "Xno"],[break])
+ break
+ done
+ CPPFLAGS="$_AX_LIB_POSTGRESQL_OLD_CPPFLAGS"
+ LDFLAGS="$_AX_LIB_POSTGRESQL_OLD_LDFLAGS"
+ LIBS="$_AX_LIB_POSTGRESQL_OLD_LIBS"
+ ])
+
+
+ AS_IF([test "x$found_postgresql" = "xyes"],[
+ AC_DEFINE([HAVE_POSTGRESQL], [1],
+ [Define to 1 if PostgreSQL libraries are available])])
+ ])
AC_SUBST([POSTGRESQL_VERSION])
- AC_SUBST([POSTGRESQL_CFLAGS])
+ AC_SUBST([POSTGRESQL_CPPFLAGS])
AC_SUBST([POSTGRESQL_LDFLAGS])
+ AC_SUBST([POSTGRESQL_LIBS])
+
+ AS_IF([test "x$found_postgresql" = "xyes"],
+ [ifelse([$2], , :, [$2])],
+ [ifelse([$3], , AS_IF([test X"$want_postgresql" = "Xyes"],[AC_MSG_ERROR([Library requirements (PostgreSQL) not met.])],[:]), [$3])])
+
])
--- a/configure.ac 2019-09-17 19:29:40.041502837 -0400
+++ b/configure.ac 2019-09-22 09:28:50.905561338 -0400
@@ -158,7 +158,7 @@
dnl ********************************************************
dnl * Check for the PostgreSQL library (PostgreSQL plugin) *
dnl ********************************************************
-AX_LIB_POSTGRESQL()
+AX_LIB_POSTGRESQL([9.0])
with_pgsql="no"
if test x$POSTGRESQL_VERSION != x; then
--- /dev/null 2019-09-21 09:30:35.976000000 -0400
+++ b/m4/ax_compare_version.m4 2019-09-22 09:56:48.116239566 -0400
@@ -0,0 +1,177 @@
+# ===========================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_compare_version.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+#
+# DESCRIPTION
+#
+# This macro compares two version strings. Due to the various number of
+# minor-version numbers that can exist, and the fact that string
+# comparisons are not compatible with numeric comparisons, this is not
+# necessarily trivial to do in a autoconf script. This macro makes doing
+# these comparisons easy.
+#
+# The six basic comparisons are available, as well as checking equality
+# limited to a certain number of minor-version levels.
+#
+# The operator OP determines what type of comparison to do, and can be one
+# of:
+#
+# eq - equal (test A == B)
+# ne - not equal (test A != B)
+# le - less than or equal (test A <= B)
+# ge - greater than or equal (test A >= B)
+# lt - less than (test A < B)
+# gt - greater than (test A > B)
+#
+# Additionally, the eq and ne operator can have a number after it to limit
+# the test to that number of minor versions.
+#
+# eq0 - equal up to the length of the shorter version
+# ne0 - not equal up to the length of the shorter version
+# eqN - equal up to N sub-version levels
+# neN - not equal up to N sub-version levels
+#
+# When the condition is true, shell commands ACTION-IF-TRUE are run,
+# otherwise shell commands ACTION-IF-FALSE are run. The environment
+# variable 'ax_compare_version' is always set to either 'true' or 'false'
+# as well.
+#
+# Examples:
+#
+# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
+# AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
+#
+# would both be true.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
+# AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
+#
+# would both be false.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
+#
+# would be true because it is only comparing two minor versions.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
+#
+# would be true because it is only comparing the lesser number of minor
+# versions of the two values.
+#
+# Note: The characters that separate the version numbers do not matter. An
+# empty string is the same as version 0. OP is evaluated by autoconf, not
+# configure, so must be a string, not a variable.
+#
+# The author would like to acknowledge Guido Draheim whose advice about
+# the m4_case and m4_ifvaln functions make this macro only include the
+# portions necessary to perform the specific comparison specified by the
+# OP argument in the final configure script.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 13
+
+dnl #########################################################################
+AC_DEFUN([AX_COMPARE_VERSION], [
+ AC_REQUIRE([AC_PROG_AWK])
+
+ # Used to indicate true or false condition
+ ax_compare_version=false
+
+ # Convert the two version strings to be compared into a format that
+ # allows a simple string comparison. The end result is that a version
+ # string of the form 1.12.5-r617 will be converted to the form
+ # 0001001200050617. In other words, each number is zero padded to four
+ # digits, and non digits are removed.
+ AS_VAR_PUSHDEF([A],[ax_compare_version_A])
+ A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/[[^0-9]]//g'`
+
+ AS_VAR_PUSHDEF([B],[ax_compare_version_B])
+ B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/[[^0-9]]//g'`
+
+ dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
+ dnl # then the first line is used to determine if the condition is true.
+ dnl # The sed right after the echo is to remove any indented white space.
+ m4_case(m4_tolower($2),
+ [lt],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+ ],
+ [gt],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+ ],
+ [le],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+ ],
+ [ge],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+ ],[
+ dnl Split the operator from the subversion count if present.
+ m4_bmatch(m4_substr($2,2),
+ [0],[
+ # A count of zero means use the length of the shorter version.
+ # Determine the number of characters in A and B.
+ ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
+ ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
+
+ # Set A to no more than B's length and B to no more than A's length.
+ A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
+ B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
+ ],
+ [[0-9]+],[
+ # A count greater than zero means use only that many subversions
+ A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+ B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+ ],
+ [.+],[
+ AC_WARNING(
+ [invalid OP numeric parameter: $2])
+ ],[])
+
+ # Pad zeros at end of numbers to make same length.
+ ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
+ B="$B`echo $A | sed 's/./0/g'`"
+ A="$ax_compare_version_tmp_A"
+
+ # Check for equality or inequality as necessary.
+ m4_case(m4_tolower(m4_substr($2,0,2)),
+ [eq],[
+ test "x$A" = "x$B" && ax_compare_version=true
+ ],
+ [ne],[
+ test "x$A" != "x$B" && ax_compare_version=true
+ ],[
+ AC_WARNING([invalid OP parameter: $2])
+ ])
+ ])
+
+ AS_VAR_POPDEF([A])dnl
+ AS_VAR_POPDEF([B])dnl
+
+ dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
+ if test "$ax_compare_version" = "true" ; then
+ m4_ifvaln([$4],[$4],[:])dnl
+ m4_ifvaln([$5],[else $5])dnl
+ fi
+]) dnl AX_COMPARE_VERSION
--- a/configure.ac 2019-09-17 19:29:40.041502837 -0400
+++ b/configure.ac 2019-09-22 10:13:22.432485117 -0400
@@ -170,7 +170,7 @@
LIBS=$LIBS_bkp;
CPPFLAGS_bkp=$CPPFLAGS
- CPPFLAGS="$POSTGRESQL_CFLAGS"
+ CPPFLAGS="$POSTGRESQL_CPPFLAGS"
AC_CHECK_HEADER(libpq-fe.h, with_pgsql=yes, with_pgsql=no)
CPPFLAGS=$CPPFLAGS_bkp;
fi
--- a/plugins/sql/pgsql/Makefile.am 2019-09-17 18:49:46.257217168 -0400
+++ b/plugins/sql/pgsql/Makefile.am 2019-09-22 10:15:40.613739821 -0400
@@ -1,4 +1,4 @@
-AM_CPPFLAGS=@PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @POSTGRESQL_CFLAGS@
+AM_CPPFLAGS=@PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @POSTGRESQL_CPPFLAGS@
pgsql_la_LDFLAGS = -module -avoid-version @LIBPRELUDE_LDFLAGS@
if HAVE_PGSQL

View File

@ -1,50 +0,0 @@
--- libpreludedb-0.9.11/configure.in.lib64 2006-12-21 02:51:35.000000000 +0900
+++ libpreludedb-0.9.11/configure.in 2007-01-02 00:54:27.000000000 +0900
@@ -212,7 +212,10 @@
for dir in $default_path; do
AC_CHECK_FILE($dir/lib/libsqlite3.so, SQLITE3_LIBS="-L$dir -lsqlite3")
if test -z "$SQLITE3_LIBS"; then
- continue
+ AC_CHECK_FILE($dir/lib64/libsqlite3.so, SQLITE3_LIBS="-L$dir -L$dir/lib64 -lsqlite3")
+ if test -z "$SQLITE3_LIBS"; then
+ continue
+ fi
fi
AC_CHECK_FILE($dir/include/sqlite3.h, SQLITE3_CFLAGS="-I$dir")
--- libpreludedb-0.9.11/configure.lib64 2006-12-21 02:53:18.000000000 +0900
+++ libpreludedb-0.9.11/configure 2007-01-02 00:57:35.000000000 +0900
@@ -27318,7 +27318,32 @@
fi
if test -z "$SQLITE3_LIBS"; then
- continue
+ as_ac_File=`echo "ac_cv_file_$dir/lib64/libsqlite3.so" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $dir/lib64/libsqlite3.so" >&5
+echo $ECHO_N "checking for $dir/lib64/libsqlite3.so... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "$dir/lib64/libsqlite3.so"; then
+ eval "$as_ac_File=yes"
+else
+ eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+ SQLITE3_LIBS="-L$dir -L$dir/lib64 -lsqlite3"
+fi
+
+ if test -z "$SQLITE3_LIBS"; then
+ continue
+ fi
fi
as_ac_File=`echo "ac_cv_file_$dir/include/sqlite3.h" | $as_tr_sh`

View File

@ -1,170 +1,406 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
# API version for libpreludedb
%global major 7
# API version for libpreludedb c++ binding
%global cppmajor 2
Name: libpreludedb
Version: 0.9.11.1
Release: 2%{?dist}
Summary: Provide the framework for easy access to the Prelude database
Group: System Environment/Libraries
License: GPL
URL: http://prelude-ids.org/
Source0: http://prelude-ids.org/download/releases/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: %{name}-x86_64-sqlite3.patch
Name: libpreludedb
Version: 5.2.0
Release: 11%{?dist}
Summary: Framework for easy access to the IDMEF database
# Prelude is GPL-2.0+
# libmissing is LGPL-2.1+
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.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-Add-pkg-config-file.patch
Patch5: libpreludedb-5.2.0-fix-test_rwlock1.patch
Patch6: libpreludedb-5.2.0-fix_thread_create.patch
Patch7: libpreludedb-5.2.0-Clean_libpreludedb-config.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: bison
BuildRequires: chrpath
BuildRequires: flex
BuildRequires: gtk-doc
BuildRequires: glib2-devel
BuildRequires: swig
BuildRequires: pkgconfig(gnutls)
BuildRequires: libgpg-error-devel
BuildRequires: mariadb-connector-c-devel
BuildRequires: libpq-devel
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(libprelude) >= %{version}
BuildRequires: pkgconfig(openssl)
BuildRequires: perl-devel
BuildRequires: perl-generators
BuildRequires: python3-devel
BuildRequires: pkgconfig(zlib)
BuildRequires: libprelude, libprelude-devel, mysql-devel, postgresql-devel, python-devel, sqlite-devel
%ifnarch s390
BuildRequires: valgrind
%endif
Suggests: preludedb-mysql
Suggests: preludedb-pgsql
Suggests: preludedb-sqlite3
# Upstream do not use explicit version of gnulib, just checkout
# and update files. In libprelude 5.2.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
format
of the database used to store IDMEF alerts.
It allows developers to use the Prelude IDMEF database easily and
efficiently wi
thout worrying about SQL,
and to access the database independently of the type/format of the
database.
format of the database used to store IDMEF alerts. It allows developers to use
the Prelude IDMEF database easily and efficiently without worrying about SQL,
and to access the database independently of the type/format of the database.
%package devel
Summary: Libraries and headers for PreludeDB
Group: System Environment/Libraries
Requires: libpreludedb = %{version}-%{release}, libprelude-devel, automake
Summary: Libraries and headers for PreludeDB
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The PreludeDB Library provides an abstraction layer upon the type
and the format of the database used to store IDMEF alerts. It
allows developers to use the Prelude IDMEF database easily and
efficiently wi thout worrying about SQL, and to access the
database independently of the type/format of the database.
Libraries and headers you can use to access Prelude database using the Prelude
Library. The PreludeDB Library provides an abstraction layer upon the type and
the format of the database used to store IDMEF alerts. It allows developers to
use the Prelude IDMEF database easily and efficiently without worrying about
SQL, and to access the database independently of the type/format of the
database.
%package mysql
Summary: Plugin to use prelude with a mysql database
Group: System Environment/Libraries
Requires: libpreludedb = %{version}-%{release}, mysql, mysql-server
%package -n preludedb-tools
Summary: Command-line tools for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description mysql
This plugin authorise prelude to store alerts into a mysql database.
%description -n preludedb-tools
Provides a convenient interface for accessing Prelude alerts.
%package pgsql
Summary: Plugin to use prelude with a pgsql database
Group: System Environment/Libraries
Requires: libpreludedb = %{version}-%{release}, postgresql-server
%package -n python3-preludedb
Summary: Python 3 bindings for preludedb
Requires: %{name}%{?_isa} = %{version}-%{release}
%{?python_provide:%python_provide python3-prelude}
Requires: python3-prelude
%description pgsql
This plugin authorise prelude to store alerts into a pgsql database.
%description -n python3-preludedb
Provides python 3 bindings for preludedb.
%package sqlite
Summary: Plugin to use prelude with a sqlite database
Group: System Environment/Libraries
Requires: libpreludedb = %{version}-%{release}, sqlite
%package -n preludedb-mysql
Summary: Plugin to use prelude with a MySQL database
Requires: %{name}%{?_isa} = %{version}-%{release}
%description sqlite
This plugin authorise prelude to store alerts into a sqlite database.
%description -n preludedb-mysql
This plugin authorize prelude to store alerts into a MySQL
database.
%package python
Summary: Python bindings for libpreludedb
Group: System Environment/Libraries
Requires: libpreludedb = %{version}-%{release}
%package -n preludedb-pgsql
Summary: Plugin to use prelude with a PostgreSQL database
Requires: %{name}%{?_isa} = %{version}-%{release}
%description python
Python bindings for libpreludedb.
%description -n preludedb-pgsql
This plugin authorize prelude to store alerts into a PostgreSQL
database.
%package perl
Summary: Perl bindings for libpreludedb
Group: System Environment/Libraries
Requires: libpreludedb = %{version}-%{release}
%package -n preludedb-sqlite3
Summary: Plugin to use prelude with a SQLite3 database
Requires: %{name}%{?_isa} = %{version}-%{release}
%description perl
Perl bindings for libpreludedb.
%description -n preludedb-sqlite3
This plugin authorize prelude to store alerts into a SQLite3
database.
%package doc
Summary: Documentation for preludedb
BuildArch: noarch
%description doc
Provides documentation for preludedb generated by gtk-doc.
%prep
%setup -q
%patch0 -p1
%autosetup -p1
%build
%configure --with-html-dir=%{_defaultdocdir}/%{name}-%{version}/html \
--disable-static
# removing rpath
sed -i.rpath -e 's|LD_RUN_PATH=""||' bindings/Makefile
make
%configure \
--disable-rpath \
--disable-static \
--enable-shared \
--includedir=%{_includedir}/%{name} \
--with-swig \
--with-perl-installdirs=vendor \
--without-python2 \
--with-python3 \
--enable-gtk-doc \
--with-html-dir=%{_docdir}/%{name}-devel
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
%make_build
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
mkdir -p %{buildroot}%{perl_vendorarch}
make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p"
cp -p ChangeLog README NEWS COPYING LICENSE.README HACKING.README \
%{buildroot}%{_defaultdocdir}/%{name}-%{version}
mv %{buildroot}%{perl_sitearch}/* %{buildroot}%{perl_vendorarch}
rm -f %{buildroot}/%{perl_archlib}/perllocal.pod
rm -f %{buildroot}/%{_libdir}/%{name}.la
rm -f %{buildroot}/%{_libdir}/%{name}/plugins/formats/classic.la
rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/mysql.la
rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/pgsql.la
rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/sqlite3.la
rm -f %{buildroot}/%{perl_vendorarch}/auto/PreludeDB/.packlist
rm -f %{buildroot}/%{perl_vendorarch}/auto/PreludeDB/PreludeDB.bs
%make_install
%clean
rm -rf %{buildroot}
chrpath -d %{buildroot}%{_libdir}/*.so.*
%post -p /sbin/ldconfig
find %{buildroot} -name '*.la' -delete
find %{buildroot} -name 'perllocal.pod' -delete
find %{buildroot} -name '.packlist' -delete
%postun -p /sbin/ldconfig
chmod +x %{buildroot}%{_datadir}/%{name}/classic/mysql2pgsql.sh
chmod +x %{buildroot}%{_datadir}/%{name}/classic/mysql2sqlite.sh
# Enable test again after fixing #1629893
#%check
#%make_build check
%ldconfig_scriptlets -n %{name}
%files
%defattr(-,root,root,-)
%{_bindir}/preludedb-admin
%{_libdir}/%{name}.so.%{major}
%{_libdir}/%{name}.so.%{major}.*
%{_libdir}/%{name}cpp.so.%{cppmajor}
%{_libdir}/%{name}cpp.so.%{cppmajor}.*
%dir %{_libdir}/%{name}/
%{_libdir}/%{name}*.so.*
%dir %{_libdir}/%{name}/plugins/
%dir %{_libdir}/%{name}/plugins/formats/
%{_libdir}/%{name}/plugins/formats/*
%dir %{_defaultdocdir}/%{name}-%{version}/
%doc %{_defaultdocdir}/%{name}-%{version}/[A-Z]*
%dir %{_libdir}/%{name}/plugins/sql/
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/classic/
%dir %{_libdir}/%{name}/plugins
%dir %{_libdir}/%{name}/plugins/formats
%dir %{_libdir}/%{name}/plugins/sql
%{_libdir}/%{name}/plugins/formats/classic.so
%license COPYING LICENSE.README HACKING.README
%doc README NEWS
%files devel
%defattr(-,root,root)
%{_datadir}/%{name}
%{_bindir}/%{name}-config
%{_libdir}/%{name}*.so
%dir %{_includedir}/%{name}/
%{_includedir}/%{name}/*
%{_datadir}/aclocal/libpreludedb.m4
%doc %{_defaultdocdir}/%{name}-%{version}/html/
%{_libdir}/%{name}.so
%{_libdir}/%{name}cpp.so
%{_includedir}/%{name}
%{_datadir}/aclocal/%{name}.m4
%{_mandir}/man1/%{name}-config.1.gz
%files python
%{python_sitearch}/*
%files -n preludedb-tools
%{_bindir}/preludedb-admin
%{_mandir}/man1/preludedb-admin.1.gz
%files perl
%defattr(0755,root,root)
%{perl_vendorarch}/auto/*
%attr(0644,root,root) %{perl_vendorarch}/PreludeDB.pm
%files -n python3-preludedb
%{python3_sitearch}/_preludedb.*so
%{python3_sitearch}/__pycache__/preludedb.cpython-%{python3_version_nodots}.*pyc
%{python3_sitearch}/preludedb-%{version}-py%{python3_version}.egg-info
%{python3_sitearch}/preludedb.py
%files mysql
%defattr(0755,root,root)
%files -n preludedb-mysql
%{_libdir}/%{name}/plugins/sql/mysql.so
%attr(0644,root,root) %{_datadir}/%{name}/classic/mysql*.sql
%attr(0755,root,root) %{_datadir}/%{name}/classic/*.sh
%dir %{_datadir}/%{name}/classic
%{_datadir}/%{name}/classic/mysql*.sql
%files sqlite
%defattr(-,root,root)
%{_libdir}/%{name}/plugins/sql/sqlite3.so
%{_datadir}/%{name}/classic/sqlite*
%files pgsql
%defattr(-,root,root)
%files -n preludedb-pgsql
%{_libdir}/%{name}/plugins/sql/pgsql.so
%{_datadir}/%{name}/classic/pgsql*
%dir %{_datadir}/%{name}/classic
%{_datadir}/%{name}/classic/pgsql*.sql
%files -n preludedb-sqlite3
%{_libdir}/%{name}/plugins/sql/sqlite3.so
%dir %{_datadir}/%{name}/classic
%{_datadir}/%{name}/classic/sqlite*.sql
%files doc
%{_docdir}/%{name}-devel
%license COPYING LICENSE.README HACKING.README
%doc ChangeLog README NEWS
%changelog
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 5.2.0-9
- Rebuilt for Python 3.11
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 5.2.0-6
- Rebuilt for Python 3.10
* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 5.2.0-5
- rebuild for libpq ABI fix rhbz#1908268
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Sep 21 2020 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.2.0-3
- Fix libpreludedb-config
* Fri Sep 18 2020 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.2.0-2
- Clean libpreludedb-config
* Thu Sep 17 2020 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.2.0-1
- Bump version 5.2.0
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 5.1.0-4
- Rebuilt for Python 3.9
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Nov 10 2019 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.1.0-2
- Add missing patches
* Fri Nov 08 2019 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.1.0-1
- Bump version 5.1.0
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 5.0.0-5
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 5.0.0-4
- Rebuilt for Python 3.8
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Jul 13 2019 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.0.0-2
- Fix FTBFS with Python 3.8 (#1706207)
* Tue Feb 26 2019 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.0.0-1
- Bump version 5.0.0
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sun Sep 23 2018 Thomas Andrejak <thomas.andrejak@gmail.com> - 4.1.0-5
- Remove Python2 packages
* Tue Jul 24 2018 Thomas Andrejak <thomas.andrejak@gmail.com> - 4.1.0-4
- Fix FTBFS, #1604645
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 4.1.0-2
- Rebuilt for Python 3.7
* Tue Mar 20 2018 Thomas Andrejak <thomas.andrejak@gmail.com> - 4.1.0-1
- Bump version 4.1.0
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Sep 23 2017 Thomas Andrejak <thomas.andrejak@gmail.com> - 4.0.0-1
- Bump version 4.0.0
- Fix #1493632
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Jan 9 2017 Thomas Andrejak <thomas.andrejak@gmail.com> - 3.1.0-1
- Bump version
* Sun Mar 10 2013 Steve Grubb <sgrubb@redhat.com> - 1:1.0.0-16
- Add -i to autoreconf to add missing test-driver
- Add libtool as build dependency
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.0.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Sep 06 2012 Steve Grubb <sgrubb@redhat.com> - 1:1.0.0-14
- Add provides bundled gnulib
* Wed Aug 08 2012 Petr Pisar <ppisar@redhat.com> - 1:1.0.0-13
- Fix building with glibc-2.16.6 (bug #839607)
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.0.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sun Jun 10 2012 Petr Pisar <ppisar@redhat.com> - 1:1.0.0-11
- Perl 5.16 rebuild
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.0.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Fri Jun 17 2011 Marcela Maslanova <mmaslano@redhat.com> - 1:1.0.0-9
- Perl mass rebuild
* Fri Jun 10 2011 Marcela Maslanova <mmaslano@redhat.com> - 1:1.0.0-8
- Perl 5.14 mass rebuild
* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 1:1.0.0-7
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 1:1.0.0-5
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 1:1.0.0-4
- Mass rebuild with perl-5.12.0
* Sun May 02 2010 Steve Grubb <sgrubb@redhat.com> 1.0.0-3
- Fix requires
* Fri Apr 30 2010 Steve Grubb <sgrubb@redhat.com> 1.0.0-2
- new upstream release
* Sat Jan 30 2010 Steve Grubb <sgrubb@redhat.com> 1.0.0rc1-1
- new upstream bugfix release
* Thu Dec 17 2009 Steve Grubb <sgrubb@redhat.com> 0.9.15.3-1
- new upstream bugfix release
* Mon Dec 7 2009 Stepan Kasal <skasal@redhat.com> - 0.9.15.1-6
- rebuild against perl 5.10.1
* Tue Aug 25 2009 Steve Grubb <sgrubb@redhat.com> - 0.9.15.1-5
- rebuild for new openssl
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.15.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 0.9.15.1-3
- rebuild for dependencies
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.9.15.1-2
- Rebuild for Python 2.6
* Sun Sep 14 2008 Steve Grubb <sgrubb@redhat.com> 0.9.15.1-1
- new upstream bugfix release
* Wed Aug 27 2008 Steve Grubb <sgrubb@redhat.com> 0.9.15-1
- new upstream release
* Fri Jul 04 2008 Steve Grubb <sgrubb@redhat.com> - 0.9.14.1-4
- Fix perl bindings (#453935)
* Wed Jun 25 2008 Tomas Mraz <tmraz@redhat.com> - 0.9.14.1-3
- rebuild with new gnutls
- fix install of perl bindings
* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.9.14.1-2
- Autorebuild for GCC 4.3
* Mon Jan 14 2008 Steve Grubb <sgrubb@redhat.com> 0.9.14.1-1
- new upstream version 0.9.14.1
* Sun Dec 09 2007 <alexlan at fedoraproject dot org> - 0.9.11.1-4
- Add missing BR: perl-devel
* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.9.11.1-3
- Rebuild for deps
* Fri Jan 05 2007 Thorsten Scherf <tscherf@redhat.com> 0.9.11.1-2
- moved to new upstream version 0.9.11.1
@ -194,4 +430,3 @@ rm -rf %{buildroot}
* Tue Oct 24 2006 Thorsten Scherf <tscherf@redhat.com> 0.9.10-1
- New fedora build based on release 0.9.10
- New fedora build based on release 0.9.10

View File

@ -1 +1 @@
e50b62ff520c25a48aac3577cc1f92f0 libpreludedb-0.9.11.1.tar.gz
SHA512 (libpreludedb-5.2.0.tar.gz) = 357e3ce69927ed405bc757774466631d34cad9b53031be6ce456238dd8aef3781471ecbb36ab4a3131468f4686a635095aaf837d23a0efc9db758322298e7744