diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch deleted file mode 100644 index 5ae92af..0000000 --- a/absolute_path_fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -Author: Adam Majer -Date: Fri Mar 3 15:59:09 CET 2017 -Summary: Remove pure ugliness with paths - -Index: mariadb-connector-c-3.1.11-src/mariadb_config/libmariadb.pc.in -=================================================================== ---- mariadb-connector-c-3.1.11-src.orig/mariadb_config/libmariadb.pc.in -+++ mariadb-connector-c-3.1.11-src/mariadb_config/libmariadb.pc.in -@@ -7,8 +7,8 @@ - # - - prefix=@CMAKE_INSTALL_PREFIX@ --includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@ --libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@ -+includedir=@INSTALL_INCLUDEDIR@ -+libdir=@INSTALL_LIBDIR@ - - Name: libmariadb - Version: @CPACK_PACKAGE_VERSION@ -Index: mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in -=================================================================== ---- mariadb-connector-c-3.1.11-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in -@@ -210,7 +210,7 @@ end: - } - if (!p || !p[0]) - { -- strncpy(installation_dir, "@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@", PATH_MAX - 1); -+ installation_dir[0] = 0; - return; - } - } diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 16882be..79f40d7 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 17 11:21:36 UTC 2021 - Dirk Müller + +- drop absolute_path_fix.patch: obsolete after previous change + (properly setting INSTALL_LAYOUT and libdir) + ------------------------------------------------------------------- Thu May 27 18:48:59 UTC 2021 - Kristyna Streitova diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 9f2445a..8a1cb2c 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -37,7 +37,6 @@ Source1: https://downloads.mariadb.com/Connectors/c/connector-c-%{version Source2: mariadb.keyring Source3: baselibs.conf Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch -Patch3: absolute_path_fix.patch Patch4: private_library.patch BuildRequires: cmake BuildRequires: curl-devel @@ -113,7 +112,6 @@ This package holds the development files. %prep %setup -q -n %{name}-%{version}-src %patch1 -p1 -%patch3 -p1 %patch4 -p1 %build