diff --git a/rdkit-2018.03-pg11-booleans.patch b/rdkit-2018.03-pg11-booleans.patch new file mode 100644 index 0000000..c79fee1 --- /dev/null +++ b/rdkit-2018.03-pg11-booleans.patch @@ -0,0 +1,111 @@ +diff -up rdkit-Release_2018_03_4/Code/PgSQL/rdkit/bfp_gin.c.pg11 rdkit-Release_2018_03_4/Code/PgSQL/rdkit/bfp_gin.c +--- rdkit-Release_2018_03_4/Code/PgSQL/rdkit/bfp_gin.c.pg11 2018-08-14 07:53:15.000000000 +0200 ++++ rdkit-Release_2018_03_4/Code/PgSQL/rdkit/bfp_gin.c 2018-10-22 10:01:21.282688340 +0200 +@@ -116,7 +116,7 @@ Datum gin_bfp_consistent(PG_FUNCTION_ARG + + int32 i, nCommon = 0; + for (i = 0; i < nkeys; ++i) { +- if (check[i] == TRUE) { ++ if (check[i] == true) { + ++nCommon; + } + } +diff -up rdkit-Release_2018_03_4/Code/PgSQL/rdkit/bfp_gist.c.pg11 rdkit-Release_2018_03_4/Code/PgSQL/rdkit/bfp_gist.c +--- rdkit-Release_2018_03_4/Code/PgSQL/rdkit/bfp_gist.c.pg11 2018-08-14 07:53:15.000000000 +0200 ++++ rdkit-Release_2018_03_4/Code/PgSQL/rdkit/bfp_gist.c 2018-10-22 10:01:21.283688322 +0200 +@@ -137,7 +137,7 @@ gbfp_compress(PG_FUNCTION_ARGS) + + gistentryinit(*retval, PointerGetDatum(gbfp), + entry->rel, entry->page, +- entry->offset, FALSE); ++ entry->offset, false); + } + /* no change should be required on inner nodes */ + else { +@@ -166,7 +166,7 @@ gbfp_decompress(PG_FUNCTION_ARGS) + retval = (GISTENTRY *) palloc(sizeof(GISTENTRY)); + gistentryinit(*retval, PointerGetDatum(key), + entry->rel, entry->page, +- entry->offset, FALSE); ++ entry->offset, false); + PG_RETURN_POINTER(retval); + } + +@@ -680,7 +680,7 @@ gbfp_fetch(PG_FUNCTION_ARGS) + retval = palloc(sizeof(GISTENTRY)); + + gistentryinit(*retval, PointerGetDatum(bfp), +- entry->rel, entry->page, entry->offset, FALSE); ++ entry->rel, entry->page, entry->offset, false); + + PG_RETURN_POINTER(retval); + } +diff -up rdkit-Release_2018_03_4/Code/PgSQL/rdkit/low_gist.c.pg11 rdkit-Release_2018_03_4/Code/PgSQL/rdkit/low_gist.c +--- rdkit-Release_2018_03_4/Code/PgSQL/rdkit/low_gist.c.pg11 2018-10-22 10:01:45.598267763 +0200 ++++ rdkit-Release_2018_03_4/Code/PgSQL/rdkit/low_gist.c 2018-10-22 10:01:54.674110783 +0200 +@@ -55,7 +55,7 @@ gslfp_compress(PG_FUNCTION_ARGS) + + gistentryinit(*retval, PointerGetDatum(makeLowSparseFingerPrint(fp, NUMRANGE)), + entry->rel, entry->page, +- entry->offset, FALSE); ++ entry->offset, false); + freeCSfp(fp); + } + +@@ -76,7 +76,7 @@ gslfp_decompress(PG_FUNCTION_ARGS) + + gistentryinit(*retval, PointerGetDatum(key), + entry->rel, entry->page, +- entry->offset, FALSE); ++ entry->offset, false); + + PG_RETURN_POINTER(retval); + } +diff -up rdkit-Release_2018_03_4/Code/PgSQL/rdkit/rdkit_gist.c.pg11 rdkit-Release_2018_03_4/Code/PgSQL/rdkit/rdkit_gist.c +--- rdkit-Release_2018_03_4/Code/PgSQL/rdkit/rdkit_gist.c.pg11 2018-08-14 07:53:15.000000000 +0200 ++++ rdkit-Release_2018_03_4/Code/PgSQL/rdkit/rdkit_gist.c 2018-10-22 10:01:21.284688305 +0200 +@@ -69,7 +69,7 @@ compressAllTrue(GISTENTRY *entry) + + gistentryinit(*retval, PointerGetDatum(b), + entry->rel, entry->page, +- entry->offset, FALSE); ++ entry->offset, false); + + return retval; + } +@@ -89,7 +89,7 @@ gmol_compress(PG_FUNCTION_ARGS) + + gistentryinit(*retval, PointerGetDatum(makeMolSignature(m)), + entry->rel, entry->page, +- entry->offset, FALSE); ++ entry->offset, false); + freeCROMol(m); + } + else if ( !ISALLTRUE(DatumGetPointer(entry->key)) ) { +@@ -114,7 +114,7 @@ gsfp_compress(PG_FUNCTION_ARGS) + + gistentryinit(*retval, PointerGetDatum(makeSfpSignature(fp, NUMBITS)), + entry->rel, entry->page, +- entry->offset, FALSE); ++ entry->offset, false); + freeCSfp(fp); + } + else if ( !ISALLTRUE(DatumGetPointer(entry->key)) ) { +@@ -137,7 +137,7 @@ gmol_decompress(PG_FUNCTION_ARGS) + + gistentryinit(*retval, PointerGetDatum(key), + entry->rel, entry->page, +- entry->offset, FALSE); ++ entry->offset, false); + + PG_RETURN_POINTER(retval); + } +@@ -738,7 +738,7 @@ greaction_compress(PG_FUNCTION_ARGS) + + gistentryinit(*retval, PointerGetDatum(makeReactionSign(rxn)), + entry->rel, entry->page, +- entry->offset, FALSE); ++ entry->offset, false); + freeChemReaction(rxn); + } + else if ( !ISALLTRUE(DatumGetPointer(entry->key)) ) { diff --git a/rdkit.spec b/rdkit.spec index 47f8a36..bbeda01 100644 --- a/rdkit.spec +++ b/rdkit.spec @@ -9,7 +9,7 @@ Name: rdkit Version: %{year}.%{month}.%{extraver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Chemical informatics and machine learning toolkit License: BSD URL: http://www.rdkit.org/ @@ -61,6 +61,7 @@ Patch1: rdkit-2018.03-do_not_install_sping.patch Patch2: rdkit-2018.03-fix_cmake_files_path.patch Patch4: rdkit-2015.03-dont_install_contrib.patch Patch5: rdkit-2018.03-pg-build.patch +Patch6: rdkit-2018.03-pg11-booleans.patch %description @@ -126,6 +127,7 @@ pushd python3 %patch1 -p1 %patch2 -p1 %patch5 -p1 +%patch6 -p1 rm -rf rdkit/sping @@ -254,6 +256,10 @@ popd %{_datadir}/pgsql/extension/rdkit.control %changelog +* Mon Oct 22 2018 Petr Kubat - 2017.03.4-2 +- rebuild for PostgreSQL 11 +- use lowercased postgresql boolean definitions + * Tue Sep 25 2018 Gianluca Sforna - 2018.03.4-1 - upstream release 2018.03.4 - remove python 2 build for Fedora 30