diff --git a/.gitignore b/.gitignore index 10d0a0b..358efcd 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /mariadb-connector-odbc-3.1.5-ga-src.tar.gz /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 diff --git a/add_docs_license_dir_option b/add_docs_license_dir_option new file mode 100644 index 0000000..be7416e --- /dev/null +++ b/add_docs_license_dir_option @@ -0,0 +1,68 @@ +This patch is giving the maintainer option to define path to COPYING and README files. + + +--- 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/mariadb-connector-odbc.spec b/mariadb-connector-odbc.spec index c95fd48..1c4a83c 100644 --- a/mariadb-connector-odbc.spec +++ b/mariadb-connector-odbc.spec @@ -2,7 +2,7 @@ %bcond_with debug Name: mariadb-connector-odbc -Version: 3.1.7 +Version: 3.1.9 Release: 1%{?with_debug:.debug}%{?dist} Summary: The MariaDB Native Client library (ODBC driver) License: LGPLv2+ @@ -14,6 +14,7 @@ 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 @@ -24,6 +25,7 @@ and it supports both Unicode and ANSI modes. %prep %setup -q -n %{name}-%{version}-ga-src %patch1 -p1 +%patch2 -p1 %build %{set_build_flags} @@ -38,11 +40,11 @@ export CFLAGS CXXFLAGS -DCMAKE_BUILD_TYPE="%{?with_debug:Debug}%{!?with_debug:RelWithDebInfo}" \ -DCMAKE_INSTALL_PREFIX="%{_usr}" \ -DINCLUDE_INSTALL_DIR="%{_includedir}" \ - -DINSTALL_LIB_SUFFIX="%{_lib}" \ + -DINSTALL_LIBDIR="%{_lib}" \ -DSHARE_INSTALL_PREFIX="%{_datadir}" \ -DSYSCONF_INSTALL_DIR="%{_sysconfdir}" \ - -DINSTALL_DOC_DIR="%{_defaultdocdir}/%{name}" \ - -DINSTALL_LICENSE_DIR="%{_defaultlicensedir}/%{name}" \ + -DINSTALL_DOCDIR="%{_defaultdocdir}/%{name}" \ + -DINSTALL_LICENSEDIR="%{_defaultlicensedir}/%{name}" \ . #cmake -LAH @@ -61,6 +63,10 @@ cmake -L . %changelog +* Thu Jul 02 2020 Lukas Javorsky - 3.1.9-1 +- Rebase to 3.1.9 +- Add patch add_docs_license_dir_option + * Thu Apr 09 2020 Michal Schorm - 3.1.7-1 - Rebase to 3.1.7 diff --git a/sources b/sources index 3fb3a68..65c35c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mariadb-connector-odbc-3.1.7-ga-src.tar.gz) = c758c52d033a3f3aba07092f23a4cfe34a182bd72d5aeb342cf00591f371392282da378c85bb356f9d6909bea62b2bff69594a3b41bfe32341f48f77f52bfd51 +SHA512 (mariadb-connector-odbc-3.1.9-ga-src.tar.gz) = f9b7c2658223d6bc3c39cfe8c49e2b4cc4cd5dbfbcd22ffcfc7065ec9b4240df69e456da4fd4ca55774fd89e8e89917927824a610b13dd0f497527ccd87f9a9c