pool/mariadb-connector-c
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 900561 from home:dirkmueller:Factory

Browse Source 
- drop absolute_path_fix.patch: obsolete after previous change
  (properly setting INSTALL_LAYOUT and libdir)

OBS-URL: https://build.opensuse.org/request/show/900561
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=69
This commit is contained in:
Martin Pluskal 2021-06-17 12:25:39 +00:00 committed by Git OBS Bridge
parent eae9b5c259
commit b2c9ce7217
3 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
absolute_path_fix.patch
View File

@ -1,32 +0,0 @@
Author: Adam Majer <amajer@suse.de>
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;
}
}

6
mariadb-connector-c.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 17 11:21:36 UTC 2021 - Dirk Müller <dmueller@suse.com>
- 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 <kstreitova@suse.com>

2
mariadb-connector-c.spec
View File

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