From 9849abe91b4767439c7c205222ac4fe3788b405f Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Dec 14 2020 11:14:00 +0000 Subject: Rebase to 3.1.11 Add updates for paths in libraries_include_path.patch Patch add_docs_license_dir_option upstreamed --- diff --git a/.gitignore b/.gitignore index 358efcd..c780d35 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /mariadb-connector-odbc-3.1.6-ga-src.tar.gz /mariadb-connector-odbc-3.1.7-ga-src.tar.gz /mariadb-connector-odbc-3.1.9-ga-src.tar.gz +/mariadb-connector-odbc-3.1.10-ga-src.tar.gz +/mariadb-connector-odbc-3.1.11-ga-src.tar.gz diff --git a/add_docs_license_dir_option b/add_docs_license_dir_option deleted file mode 100644 index 014a03a..0000000 --- a/add_docs_license_dir_option +++ /dev/null @@ -1,69 +0,0 @@ -This patch is giving the maintainer option to define path to COPYING and README files. - -Github PR: https://github.com/mariadb-corporation/mariadb-connector-odbc/pull/36 - ---- mariadb-connector-odbc-3.1.9-ga-src/CMakeLists.txt.old 2020-07-07 13:46:42.106327846 +0200 -+++ mariadb-connector-odbc-3.1.9-ga-src/CMakeLists.txt 2020-07-07 13:47:34.037882817 +0200 -@@ -378,7 +378,7 @@ - #IF(NOT DEFINED INSTALL_LICENSE_DIR) - # SET(INSTALL_LICENSE_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CPACK_PACKAGE_NAME}/" CACHE STRING "Directory, where to install license file") - #ENDIF() -- MESSAGE(STATUS "Documentation and License file are installed to ${INSTALL_DOCDIR}") -+ MESSAGE(STATUS "Documentation and License file are installed to ${INSTALL_DOCDIR} and ${INSTALL_LICENSEDIR}") - # MESSAGE(STATUS "License file installed to ${INSTALL_LICENSE_DIR}") - - INSTALL(FILES -@@ -389,7 +389,7 @@ - INSTALL(FILES - ${CMAKE_SOURCE_DIR}/COPYING - DESTINATION -- "${INSTALL_DOCDIR}" -+ "${INSTALL_LICENSEDIR}" - COMPONENT Documentation) - ENDIF() - - ---- mariadb-connector-odbc-3.1.9-ga-src/cmake/install.cmake.old 2020-07-07 13:46:49.653408500 +0200 -+++ mariadb-connector-odbc-3.1.9-ga-src/cmake/install.cmake 2020-07-07 13:50:40.297873326 +0200 -@@ -21,6 +21,8 @@ - # INSTALL_BINDIR location of binaries (mariadb_config) - # INSTALL_LIBDIR location of libraries - # INSTALL_PLUGINDIR location of plugins -+# INSTALL_DOCDIR location of docs -+# INSTALL_LICENSEDIR location of license - - IF(NOT INSTALL_LAYOUT) - SET(INSTALL_LAYOUT "DEFAULT") -@@ -65,6 +67,7 @@ - SET(INSTALL_PCDIR_DEFAULT "lib/pkgconfig") - SET(INSTALL_INCLUDEDIR_DEFAULT "include/mariadb") - SET(INSTALL_DOCDIR_DEFAULT "docs") -+SET(INSTALL_LICENSEDIR_DEFAULT ${INSTALL_DOCDIR}) - IF(NOT IS_SUBPROJECT) - SET(INSTALL_PLUGINDIR_DEFAULT "lib/mariadb/plugin") - ELSE() -@@ -117,6 +120,14 @@ - SET(INSTALL_PLUGINDIR_${INSTALL_LAYOUT} ${INSTALL_PLUGINDIR}) - ENDIF() - -+IF(INSTALL_DOCDIR) -+ SET(INSTALL_DOCDIR_${INSTALL_LAYOUT} ${INSTALL_DOCDIR}) -+ENDIF() -+ -+IF(INSTALL_LICENSEDIR) -+ SET(INSTALL_LICENSEDIR_${INSTALL_LAYOUT} ${INSTALL_LICENSEDIR}) -+ENDIF() -+ - # Extra INSTALL_PLUGINDIR_CLIENT that overrides any INSTALL_PLUGINDIR override - IF(INSTALL_PLUGINDIR_CLIENT) - SET(INSTALL_PLUGINDIR_${INSTALL_LAYOUT} ${INSTALL_PLUGINDIR_CLIENT}) -@@ -140,7 +151,7 @@ - SET(INSTALL_SUFFIXDIR_${INSTALL_LAYOUT} ${INSTALL_SUFFIXDIR}) - ENDIF() - --FOREACH(dir "BIN" "LIB" "PC" "INCLUDE" "DOC" "PLUGIN") -+FOREACH(dir "BIN" "LIB" "PC" "INCLUDE" "DOC" "LICENSE" "PLUGIN") - SET(INSTALL_${dir}DIR ${INSTALL_${dir}DIR_${INSTALL_LAYOUT}}) - MARK_AS_ADVANCED(INSTALL_${dir}DIR) - #MESSAGE1(INSTALL_${dir}DIR "MariaDB Connector ODBC: INSTALL_${dir}DIR=${INSTALL_${dir}DIR}") - diff --git a/libraries_include_path.patch b/libraries_include_path.patch index 0ae8948..ca8bdf7 100644 --- a/libraries_include_path.patch +++ b/libraries_include_path.patch @@ -18,3 +18,16 @@ #include #include #include + +--- mariadb-connector-odbc-3.1.10-ga-src/ma_conv_charset.h.old 2020-10-26 11:37:51.314034870 +0100 ++++ mariadb-connector-odbc-3.1.10-ga-src/ma_conv_charset.h 2020-10-26 11:38:05.860205545 +0100 +@@ -23,7 +23,7 @@ + #ifndef _MA_CONV_CHARSET_H_ + #define _MA_CONV_CHARSET_H_ + +-#include "mariadb_ctype.h" ++#include + + size_t MADB_ConvertString(const char *from __attribute__((unused)), + size_t *from_len __attribute__((unused)), + diff --git a/mariadb-connector-odbc.spec b/mariadb-connector-odbc.spec index daded82..55eb5df 100644 --- a/mariadb-connector-odbc.spec +++ b/mariadb-connector-odbc.spec @@ -9,8 +9,8 @@ Name: mariadb-connector-odbc -Version: 3.1.9 -Release: 4%{?with_debug:.debug}%{?dist} +Version: 3.1.11 +Release: 1%{?with_debug:.debug}%{?dist} Summary: The MariaDB Native Client library (ODBC driver) License: LGPLv2+ Source: https://downloads.mariadb.org/f/connector-odbc-%{version}/%{name}-%{version}-ga-src.tar.gz @@ -21,7 +21,6 @@ BuildRequires: cmake unixODBC-devel gcc-c++ BuildRequires: mariadb-connector-c-devel >= 3.0.6 Patch1: libraries_include_path.patch -Patch2: add_docs_license_dir_option %description MariaDB Connector/ODBC is a standardized, LGPL licensed database driver using @@ -34,7 +33,6 @@ and it supports both Unicode and ANSI modes. %prep %setup -q -n %{name}-%{version}-ga-src %patch1 -p1 -%patch2 -p1 @@ -79,6 +77,10 @@ FCFLAGS="$FCFLAGS -O0 -g"; export FCFLAGS %changelog +* Mon Dec 14 2020 Lukas Javorsky - 3.1.11-1 +- Rebase to 3.1.11 +- Add updates for paths in libraries_include_path.patch + * Thu Aug 06 2020 Michal Schorm - 3.1.9-4 - Force the CMake change regarding the in-source builds also to F31 and F32 - %%cmake macro covers the %%{set_build_flags}, so they are not needed diff --git a/sources b/sources index 65c35c0..2a59cf3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mariadb-connector-odbc-3.1.9-ga-src.tar.gz) = f9b7c2658223d6bc3c39cfe8c49e2b4cc4cd5dbfbcd22ffcfc7065ec9b4240df69e456da4fd4ca55774fd89e8e89917927824a610b13dd0f497527ccd87f9a9c +SHA512 (mariadb-connector-odbc-3.1.11-ga-src.tar.gz) = 185f58b05f196bfe8b23d5470877dcfc0550be45d2f4538ddbd0b96aadde5cdbc0346ecaf65554728875e33b88761211349bf0d1def17f3b7cd43abae9d706b3