Skip to content

Commit a41c83e

Browse files
committed
ET#81319 C/CPP weekly branch is broken with DEB and RPM builds
updated the version to 9.0.0 series.
1 parent 8aef07f commit a41c83e

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ to develop MySQL client applications in C++.
112112
%global __cmake_test_opts %{nil}
113113
%endif
114114
%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-8 -DWITH_JDBC=ON -DMYSQLCLIENT_STATIC_LINKING=1 -DWITH_SSL=system %{__cmake_test_opts} %{?mysql_opt} -DDEBUG_PREFIX_MAP=OFF
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
116116
%global __cmake_cmd cmake%{?el6:3}%{?el7:3} %{__cmake_common_opts} %{__cmake_explicit_opts} ..
117117
mkdir build-dynamic && pushd build-dynamic
118118
pwd
@@ -135,7 +135,7 @@ pushd build-static
135135
make DESTDIR=%{buildroot} install
136136
popd
137137
# Add compat dir and remove unwanted file
138-
ln -s mysql-cppconn-8 %{buildroot}%{_includedir}/mysql-cppconn
138+
ln -s mysql-cppconn-9 %{buildroot}%{_includedir}/mysql-cppconn
139139
rm %{buildroot}/usr/{INFO_SRC,INFO_BIN}
140140

141141
# Add CMake files to the right location, and remove the incorrect ones
@@ -153,7 +153,7 @@ rm %{buildroot}/usr/*.cmake
153153

154154
%files
155155
%doc README.txt LICENSE.txt build-dynamic/INFO_SRC build-dynamic/INFO_BIN
156-
%{_libdir}/libmysqlcppconn8.so.@ABI_VERSION_MAJOR@*
156+
%{_libdir}/libmysqlcppconn9.so.@ABI_VERSION_MAJOR@*
157157

158158
%files jdbc
159159
%doc README.txt LICENSE.txt build-dynamic/INFO_SRC build-dynamic/INFO_BIN
@@ -163,17 +163,20 @@ rm %{buildroot}/usr/*.cmake
163163
%doc README.txt LICENSE.txt build-dynamic/INFO_SRC build-dynamic/INFO_BIN
164164
%{_libdir}/libmysqlcppconn.so
165165
%{_libdir}/libmysqlcppconn-static.a
166-
%{_libdir}/libmysqlcppconn8.so
167-
%{_libdir}/libmysqlcppconn8-static.a
166+
%{_libdir}/libmysqlcppconn9.so
167+
%{_libdir}/libmysqlcppconn9-static.a
168168
%{_includedir}/mysql-cppconn
169169
%{_libdir}/cmake/mysql-concpp/mysql-concpp-config-version.cmake
170170
%{_libdir}/cmake/mysql-concpp/mysql-concpp-config.cmake
171-
%dir %{_includedir}/mysql-cppconn-8
172-
%{_includedir}/mysql-cppconn-8/mysqlx
173-
%{_includedir}/mysql-cppconn-8/mysql
174-
%{_includedir}/mysql-cppconn-8/jdbc
171+
%dir %{_includedir}/mysql-cppconn-9
172+
%{_includedir}/mysql-cppconn-9/mysqlx
173+
%{_includedir}/mysql-cppconn-9/mysql
174+
%{_includedir}/mysql-cppconn-9/jdbc
175175

176176
%changelog
177+
* Mon May 12 2024 Gipson Pulla <[email protected]> - 9.0.0-1
178+
- Bumped the version to 9.0.0 series.
179+
177180
* Fri Nov 03 2023 Sreedhar Sreedhargadda <[email protected]> - 8.2.0-1
178181
- Added two new files as part of ET79401
179182

0 commit comments

Comments
 (0)