Skip to content

Commit 382ca8e

Browse files
rsomla1rsomla1
committed
Merge remote-tracking branch 'origin/wl16310' into trunk
2 parents b959b44 + 2a7875a commit 382ca8e

13 files changed

+99
-64
lines changed

‎CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -545,9 +545,9 @@ install(TARGETS connector
545545

546546
install(TARGETS connector
547547
CONFIGURATIONS Debug
548-
ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}/debug" COMPONENT XDevAPIDev
549-
RUNTIME DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT XDevAPIDll
550-
LIBRARY DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT XDevAPIDll
548+
ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC_DEBUG}" COMPONENT XDevAPIDev
549+
RUNTIME DESTINATION "${INSTALL_LIB_DIR_DEBUG}" COMPONENT XDevAPIDll
550+
LIBRARY DESTINATION "${INSTALL_LIB_DIR_DEBUG}" COMPONENT XDevAPIDll
551551
)
552552

553553
if(MSVC AND NOT BUILD_STATIC)
@@ -560,7 +560,7 @@ if(MSVC AND NOT BUILD_STATIC)
560560

561561
install(FILES $<TARGET_PDB_FILE:connector>
562562
CONFIGURATIONS Debug
563-
DESTINATION "${INSTALL_LIB_DIR}/debug"
563+
DESTINATION "${INSTALL_LIB_DIR_DEBUG}"
564564
COMPONENT Debuginfo
565565
)
566566

‎install_layout.cmake

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,24 @@ if(NOT INSTALL_LIB_DIR)
111111
set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR})
112112
endif()
113113

114+
if(NOT INSTALL_LIB_DIR_DEBUG)
115+
set(INSTALL_LIB_DIR_DEBUG "${INSTALL_LIB_DIR}/debug")
116+
endif()
117+
114118
if(NOT INSTALL_LIB_DIR_STATIC)
115119
set(INSTALL_LIB_DIR_STATIC "${INSTALL_LIB_DIR}")
116120
if(VS)
117121
set(INSTALL_LIB_DIR_STATIC "${INSTALL_LIB_DIR_STATIC}/${VS}")
118122
endif()
119123
endif()
120124

125+
if(NOT INSTALL_LIB_DIR_STATIC_DEBUG)
126+
set(INSTALL_LIB_DIR_STATIC_DEBUG "${INSTALL_LIB_DIR_DEBUG}")
127+
if(VS)
128+
set(INSTALL_LIB_DIR_STATIC_DEBUG "${INSTALL_LIB_DIR_STATIC_DEBUG}/${VS}")
129+
endif()
130+
endif()
131+
121132
if(NOT INSTALL_INCLUDE_DIR)
122133
set(INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
123134
endif()
@@ -141,8 +152,19 @@ set(INSTALL_LIB_DIR "${INSTALL_LIB_DIR}"
141152
CACHE INTERNAL "Library install location (relative to install root)"
142153
)
143154

155+
set(INSTALL_LIB_DIR_DEBUG "${INSTALL_LIB_DIR_DEBUG}"
156+
CACHE INTERNAL
157+
"Library install location for debug builds (relative to install root)"
158+
)
159+
144160
set(INSTALL_LIB_DIR_STATIC "${INSTALL_LIB_DIR_STATIC}"
145-
CACHE INTERNAL "Install location for static libraries (relative to install root)"
161+
CACHE INTERNAL
162+
"Install location for static libraries (relative to install root)"
163+
)
164+
165+
set(INSTALL_LIB_DIR_STATIC_DEBUG "${INSTALL_LIB_DIR_STATIC_DEBUG}"
166+
CACHE INTERNAL
167+
"Install location for static libraries for debug builds (relative to install root)"
146168
)
147169

148170
#
@@ -193,7 +215,7 @@ endif()
193215
# static runtime.
194216
#
195217

196-
set(LIB_NAME_BASE "mysqlcppconn${CONCPP_VERSION_MAJOR}")
218+
set(LIB_NAME_BASE "mysqlcppconnx")
197219
set(LIB_NAME_STATIC "${LIB_NAME_BASE}-static")
198220

199221
if(WIN32 AND STATIC_MSVCRT)

‎jdbc/CMakeLists.txt

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -336,9 +336,9 @@ install(TARGETS connector-jdbc
336336

337337
install(TARGETS connector-jdbc
338338
CONFIGURATIONS Debug
339-
ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}/debug" COMPONENT JDBCDev
340-
RUNTIME DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT JDBCDll
341-
LIBRARY DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT JDBCDll
339+
ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC_DEBUG}" COMPONENT JDBCDev
340+
RUNTIME DESTINATION "${INSTALL_LIB_DIR_DEBUG}" COMPONENT JDBCDll
341+
LIBRARY DESTINATION "${INSTALL_LIB_DIR_DEBUG}" COMPONENT JDBCDll
342342
)
343343

344344

@@ -352,7 +352,7 @@ if(MSVC AND NOT BUILD_STATIC)
352352

353353
install(FILES $<TARGET_PDB_FILE:connector-jdbc>
354354
CONFIGURATIONS Debug
355-
DESTINATION "${INSTALL_LIB_DIR}/debug"
355+
DESTINATION "${INSTALL_LIB_DIR_DEBUG}"
356356
COMPONENT Debuginfo
357357
)
358358

@@ -494,18 +494,12 @@ set(IGNORED_LIBS
494494
rest_api rest_connection_pool rest_metadata_cache rest_router rest_routing
495495
harness-library mysqlharness_stdx mysqlharness_tls
496496
router_openssl router_protobuf routing
497-
mysqlrouter_mysqlxmessages
498-
mysqlrouter_connection_pool
499-
mysqlrouter_http
500-
mysqlrouter_http_auth_backend
501-
mysqlrouter_http_auth_realm
502-
mysqlrouter_io_component
503-
mysqlrouter_lib
504-
mysqlrouter_metadata_cache
505-
mysqlrouter_routing
506497
# New DLLs added in .33
507498
destination_status
508-
mysqlrouter_destination_status
499+
# Ignore all mysqlrouter_* DLLs
500+
mysqlrouter_
501+
# New DLLs added in 9.0.0
502+
mysqlharness
509503
)
510504

511505

‎mysql-concpp-config.cmake.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ macro(main)
182182

183183
# System-wide install, DEB or RPM layout.
184184

185-
set(INCLUDE_PATH "/usr/include/mysql-cppconn-@CONCPP_VERSION_MAJOR@")
185+
set(INCLUDE_PATH "/usr/include/mysql-cppconn")
186186
get_filename_component(LIB_PATH "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
187187

188188
file(GLOB found "${LIB_PATH}/*libmysqlcppconn*")
@@ -355,7 +355,7 @@ function(find_connector which)
355355
set(base_name "mysqlcppconn")
356356
set(target_name "concpp-jdbc")
357357
else()
358-
set(base_name "mysqlcppconn@CONCPP_VERSION_MAJOR@")
358+
set(base_name "mysqlcppconnx")
359359
set(target_name "concpp-xdevapi")
360360
endif()
361361

@@ -530,7 +530,7 @@ function(add_connector_target which tgt base_name)
530530
unset(lib_path_debug CACHE)
531531
find_library(lib_path_debug
532532
NAMES ${base_name}
533-
PATHS ${MYSQL_CONCPP_RUNTIME_LIBRARY_DIR}/${vs_suffix}/debug
533+
PATHS ${MYSQL_CONCPP_RUNTIME_LIBRARY_DIR}/debug/${vs_suffix}
534534
NO_DEFAULT_PATH
535535
NO_CACHE
536536
)
@@ -557,7 +557,7 @@ function(add_connector_target which tgt base_name)
557557
if(WIN32)
558558

559559
set(lib_path_debug
560-
"${MYSQL_CONCPP_RUNTIME_LIBRARY_DIR}/${vs_suffix}/debug/${base_name}.lib"
560+
"${MYSQL_CONCPP_RUNTIME_LIBRARY_DIR}/debug/${vs_suffix}/${base_name}.lib"
561561
)
562562

563563
endif()

‎packaging/WiX/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ set(WIX_INSTALL_DIR "${WIX_INSTALL_BASE} ${MAJOR_VERSION}.${MINOR_VERSION}")
160160

161161
#set(CONCPP_MINORMAJOR_UPGRADE_CODE "a1195164-bc2d-45fb-a5e5-1ba834771ce8")
162162

163-
SET(UPGRADE_CODE_32_BIT "72D894D6-D313-41F0-A615-A3CF1F1DF749")
164-
SET(UPGRADE_CODE_64_BIT "97D95CF0-B505-4D50-B78B-3515AAB991F1")
163+
SET(UPGRADE_CODE_32_BIT "C5071C05-F2D8-4A7D-A089-F3347B2C720F")
164+
SET(UPGRADE_CODE_64_BIT "9CE29674-49E6-4D9D-B424-E851CC983906")
165165
SET(UPGRADE_CODE_OLD "FE990D78-8BB1-4880-930A-0430E707F3CA")
166166

167167
set(LICENSE_RTF "${INSTALL_DIR}/LICENSE.rtf")
@@ -183,16 +183,17 @@ else()
183183
endif()
184184
show(BUNDLE_RUNTIME_LIBRARIES)
185185

186-
set(PROGRAM_FILES_FOLDER StandardDirectory)
187186

188187
if(IS64BIT)
189188
set(IS64BIT "yes")
190189
set(PLATFORM x64)
191190
set(UPGRADE_CODE "${UPGRADE_CODE_64_BIT}")
191+
set(PROGRAM_FILES_FOLDER ProgramFiles64Folder)
192192
else()
193193
set(IS64BIT "no")
194194
set(PLATFORM x86)
195195
set(UPGRADE_CODE "${UPGRADE_CODE_32_BIT}")
196+
set(PROGRAM_FILES_FOLDER ProgramFilesFolder)
196197
endif()
197198
show(IS64BIT)
198199

‎packaging/WiX/connector-cpp.wxs.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33
<!--
44
Copyright (c) 2010, 2024, Oracle and/or its affiliates.
5-
5+
66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU General Public License, version 2.0,
88
as published by the Free Software Foundation.
9-
9+
1010
This program is designed to work with certain software (including
1111
but not limited to OpenSSL) that is licensed under separate terms, as
1212
designated in a particular file or component or in included license
1313
documentation. The authors of MySQL hereby grant you an additional
1414
permission to link the program and your derivative works with the
1515
separately licensed software that they have either included with
1616
the program or referenced in the documentation.
17-
17+
1818
This program is distributed in the hope that it will be useful, but
1919
WITHOUT ANY WARRANTY; without even the implied warranty of
2020
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
2121
the GNU General Public License, version 2.0, for more details.
22-
22+
2323
You should have received a copy of the GNU General Public License
2424
along with this program; if not, write to the Free Software Foundation, Inc.,
2525
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -180,12 +180,12 @@
180180
<!--WIX_INCLUDES -->
181181
@WIX_INCLUDES@
182182

183-
<Directory Id="@PROGRAM_FILES_FOLDER@">
183+
<StandardDirectory Id="@PROGRAM_FILES_FOLDER@">
184184
<Directory Id="directory.MySQL" Name="MySQL">
185185
<Directory Id="INSTALLDIR" Name="@WIX_INSTALL_DIR@">
186186
</Directory>
187187
</Directory>
188-
</Directory>
188+
</StandardDirectory>
189189

190190
</Package>
191191

‎packaging/deb-in/control.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ Standards-Version: 3.9.8
66
Homepage: https://dev.mysql.com/doc/connector-cpp/en/
77
Build-Depends: cmake, debhelper (>= 10), libboost-dev, libmysqlclient-dev, libssl-dev
88

9-
Package: libmysqlcppconn8-@ABI_VERSION_MAJOR@
9+
Package: libmysqlcppconnx@ABI_VERSION_MAJOR@
1010
Architecture: any
1111
Section: libs
1212
Pre-Depends: ${misc:Pre-Depends}
1313
Multi-Arch: same
14+
Provides: libmysqlcppconn8-2 (= ${binary:Version})
1415
Depends: ${shlibs:Depends}, ${misc:Depends},
1516
mysql-@DEB_SERVERPRODUCT@-client-plugins,
1617
Description: MySQL database connector for C++
@@ -32,7 +33,7 @@ Architecture: any
3233
Section: libdevel
3334
Pre-Depends: ${misc:Pre-Depends}
3435
Multi-Arch: same
35-
Depends: libmysqlcppconn@JDBC_ABI_VERSION_MAJOR@ (= ${binary:Version}), libmysqlcppconn8-@ABI_VERSION_MAJOR@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
36+
Depends: libmysqlcppconn@JDBC_ABI_VERSION_MAJOR@ (= ${binary:Version}), libmysqlcppconnx@ABI_VERSION_MAJOR@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
3637
Description: Development header files and libraries for MySQL C++ client applications
3738
This package contains the development header files and libraries necessary
3839
to develop MySQL client applications in C++.

‎packaging/deb-in/libmysqlcppconn-dev.install.in

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323

2424
usr/lib/*/libmysqlcppconn.so
2525
usr/lib/*/libmysqlcppconn-static.a
26-
usr/lib/*/libmysqlcppconn9.so
27-
usr/lib/*/libmysqlcppconn9-static.a
26+
usr/lib/*/libmysqlcppconnx.so
27+
usr/lib/*/libmysqlcppconnx-static.a
2828
usr/lib/*/cmake/mysql-concpp/mysql-concpp-config.cmake
2929
usr/lib/*/cmake/mysql-concpp/mysql-concpp-config-version.cmake
3030

31-
usr/include/mysqlx/*.h usr/include/mysql-cppconn-8/mysqlx
32-
usr/include/mysqlx/devapi/*.h usr/include/mysql-cppconn-9/mysqlx/devapi
33-
usr/include/mysqlx/devapi/detail/*.h usr/include/mysql-cppconn-9/mysqlx/devapi/detail
34-
usr/include/mysqlx/common/*.h usr/include/mysql-cppconn-9/mysqlx/common
35-
usr/include/mysql/*.h usr/include/mysql-cppconn-9/mysql
36-
usr/include/jdbc/*.h usr/include/mysql-cppconn-9/jdbc
37-
usr/include/jdbc/cppconn/*.h usr/include/mysql-cppconn-9/jdbc/cppconn
31+
usr/include/mysqlx/*.h usr/include/mysql-cppconn/mysqlx
32+
usr/include/mysqlx/devapi/*.h usr/include/mysql-cppconn/mysqlx/devapi
33+
usr/include/mysqlx/devapi/detail/*.h usr/include/mysql-cppconn/mysqlx/devapi/detail
34+
usr/include/mysqlx/common/*.h usr/include/mysql-cppconn/mysqlx/common
35+
usr/include/mysql/*.h usr/include/mysql-cppconn/mysql
36+
usr/include/jdbc/*.h usr/include/mysql-cppconn/jdbc
37+
usr/include/jdbc/cppconn/*.h usr/include/mysql-cppconn/jdbc/cppconn
3838

3939
# Build info
4040
/usr/INFO_SRC /usr/share/doc/libmysqlcppconn-dev

‎packaging/deb-in/libmysqlcppconn8-2-dbgsym.install.in renamed to ‎packaging/deb-in/libmysqlcppconnx2-dbgsym.install.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2323

2424
# Legal
25-
usr/LICENSE.txt /usr/share/doc/libmysqlcppconn8-2-dbgsym
26-
usr/README.txt /usr/share/doc/libmysqlcppconn8-2-dbgsym
25+
usr/LICENSE.txt /usr/share/doc/libmysqlcppconnx2-dbgsym
26+
usr/README.txt /usr/share/doc/libmysqlcppconnx2-dbgsym

‎packaging/deb-in/libmysqlcppconn8-2.install.in renamed to ‎packaging/deb-in/libmysqlcppconnx2.install.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
# along with this program; if not, write to the Free Software Foundation, Inc.,
2222
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2323

24-
usr/lib/*/libmysqlcppconn8.so.2*
24+
usr/lib/*/libmysqlcppconnx.so.2*
2525

2626
# Build info
27-
/usr/INFO_SRC /usr/share/doc/libmysqlcppconn8-2
28-
/usr/INFO_BIN /usr/share/doc/libmysqlcppconn8-2
27+
/usr/INFO_SRC /usr/share/doc/libmysqlcppconnx2
28+
/usr/INFO_BIN /usr/share/doc/libmysqlcppconnx2
2929

3030
# Legal
31-
usr/LICENSE.txt /usr/share/doc/libmysqlcppconn8-2
32-
usr/README.txt /usr/share/doc/libmysqlcppconn8-2
31+
usr/LICENSE.txt /usr/share/doc/libmysqlcppconnx2
32+
usr/README.txt /usr/share/doc/libmysqlcppconnx2

‎packaging/deb-in/libmysqlcppconn8-2.lintian-overrides.in renamed to ‎packaging/deb-in/libmysqlcppconnx2.lintian-overrides.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2323

2424
# Additional license file is needed so overriding this warning
25-
libmysqlcppconn8-2: extra-license-file
25+
libmysqlcppconnx2: extra-license-file

‎packaging/deb-in/libmysqlcppconnx2.postinst.in

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#! /bin/sh
2+
set -e
3+
4+
LIBDIR=/usr/lib/`dpkg-architecture -q DEB_TARGET_MULTIARCH`
5+
6+
cd ${LIBDIR}
7+
8+
# Do nothing if old name is already present
9+
test -e libmysqlcppconn8.so.2 && return 0
10+
11+
# Also skip compatibility link if the target library is not present
12+
# (e.g, the ABI version has changed)
13+
test -e libmysqlcppconnx.so.2 || return 0
14+
15+
#echo "Creating compatibility link: ${LIBDIR}/libmysqlcppconn8.so.2"
16+
ln -s libmysqlcppconnx.so.2 libmysqlcppconn8.so.2

‎packaging/mysql-connector-c++.spec.in

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ Release: 1%{?commercial:.1}%{?dist}
6161
License: %{license_type}
6262
URL: https://dev.mysql.com/doc/connector-cpp/en/
6363
Source0: https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++%{?product_suffix}-%{version}-src.tar.gz
64-
#BuildRequires: boost-devel
64+
# Note: This connector is compatible with the 8.x series.
65+
Provides: libmysqlcppconn8.so.2()(%{?__isa_bits}bit) = %{version}-%{release}
6566
BuildRequires: cmake%{?el6:3}%{?el7:3}
6667
%if 0%{?fedora} || 0%{?suse_version}
6768
BuildRequires: gcc
@@ -112,7 +113,7 @@ to develop MySQL client applications in C++.
112113
%global __cmake_test_opts %{nil}
113114
%endif
114115
%global __cmake_explicit_opts -DCMAKE_INSTALL_PREFIX="%_prefix" -DCMAKE_C_FLAGS:STRING="%optflags" -DCMAKE_CXX_FLAGS:STRING="%optflags"
115-
%global __cmake_common_opts -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/mysql-cppconn-9 -DWITH_JDBC=ON -DMYSQLCLIENT_STATIC_LINKING=1 -DWITH_SSL=system %{__cmake_test_opts} %{?mysql_opt} -DDEBUG_PREFIX_MAP=OFF
116+
%global __cmake_common_opts -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/mysql-cppconn -DWITH_JDBC=ON -DMYSQLCLIENT_STATIC_LINKING=1 -DWITH_SSL=system %{__cmake_test_opts} %{?mysql_opt} -DDEBUG_PREFIX_MAP=OFF
116117
%global __cmake_cmd cmake%{?el6:3}%{?el7:3} %{__cmake_common_opts} %{__cmake_explicit_opts} ..
117118
mkdir build-dynamic && pushd build-dynamic
118119
pwd
@@ -134,10 +135,13 @@ popd
134135
pushd build-static
135136
make DESTDIR=%{buildroot} install
136137
popd
137-
# Add compat dir and remove unwanted file
138-
ln -s mysql-cppconn-9 %{buildroot}%{_includedir}/mysql-cppconn
138+
139+
# Remove unwanted files
139140
rm %{buildroot}/usr/{INFO_SRC,INFO_BIN}
140141

142+
# Add compatibility link
143+
cd %{buildroot}%{_libdir} && ln -s libmysqlcppconnx.so.2 libmysqlcppconn8.so.2
144+
141145
# Add CMake files to the right location, and remove the incorrect ones
142146
mkdir -p %{buildroot}%{_libdir}/cmake/mysql-concpp/
143147
install -D -m 0644 %{buildroot}/usr/*.cmake %{buildroot}%{_libdir}/cmake/mysql-concpp/
@@ -153,7 +157,8 @@ rm %{buildroot}/usr/*.cmake
153157

154158
%files
155159
%doc README.txt LICENSE.txt build-dynamic/INFO_SRC build-dynamic/INFO_BIN
156-
%{_libdir}/libmysqlcppconn9.so.@ABI_VERSION_MAJOR@*
160+
%{_libdir}/libmysqlcppconnx.so.@ABI_VERSION_MAJOR@*
161+
%{_libdir}/libmysqlcppconn8.so.2
157162

158163
%files jdbc
159164
%doc README.txt LICENSE.txt build-dynamic/INFO_SRC build-dynamic/INFO_BIN
@@ -163,15 +168,11 @@ rm %{buildroot}/usr/*.cmake
163168
%doc README.txt LICENSE.txt build-dynamic/INFO_SRC build-dynamic/INFO_BIN
164169
%{_libdir}/libmysqlcppconn.so
165170
%{_libdir}/libmysqlcppconn-static.a
166-
%{_libdir}/libmysqlcppconn9.so
167-
%{_libdir}/libmysqlcppconn9-static.a
168-
%{_includedir}/mysql-cppconn
171+
%{_libdir}/libmysqlcppconnx.so
172+
%{_libdir}/libmysqlcppconnx-static.a
169173
%{_libdir}/cmake/mysql-concpp/mysql-concpp-config-version.cmake
170174
%{_libdir}/cmake/mysql-concpp/mysql-concpp-config.cmake
171-
%dir %{_includedir}/mysql-cppconn-9
172-
%{_includedir}/mysql-cppconn-9/mysqlx
173-
%{_includedir}/mysql-cppconn-9/mysql
174-
%{_includedir}/mysql-cppconn-9/jdbc
175+
%{_includedir}/mysql-cppconn
175176

176177
%changelog
177178
* Mon May 12 2024 Gipson Pulla <[email protected]> - 9.0.0-1

0 commit comments

Comments
 (0)