Accepting request 529918 from home:kstreitova:branches:server:database

- move libraries to %{_libdir}/mariadb/ to avoid a conflict

OBS-URL: https://build.opensuse.org/request/show/529918
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=15

mariadb-connector-c.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 29 11:05:34 UTC 2017 - kstreitova@suse.com
+
+- move libraries to %{_libdir}/mariadb/ to avoid a conflict
+
 -------------------------------------------------------------------
 Thu Sep 14 15:08:28 UTC 2017 - kstreitova@suse.com
 

mariadb-connector-c.spec

@@ -108,7 +108,7 @@ This package holds the development files.
   %endif
   -DWITH_EXTERNAL_ZLIB:BOOL=ON \
   -DMARIADB_UNIX_ADDR:STRING=%{_rundir}/mysql/mysql.sock \
-  -DINSTALL_LIBDIR:STRING=%{_libdir}/ \
+  -DINSTALL_LIBDIR:STRING=%{_libdir}/mariadb \
   -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mariadb/plugin/ \
   -DWITH_MYSQLCOMPAT=ON \
   -DWITH_SSL=OPENSSL 
@@ -118,14 +118,14 @@ make %{?_smp_mflags}
 %cmake_install
 
 # remove static linked libraries
-rm %{buildroot}%{_libdir}/libmariadbclient.a
-rm %{buildroot}%{_libdir}/libmysqlclient.a
-rm %{buildroot}%{_libdir}/libmysqlclient_r.a
+rm %{buildroot}%{_libdir}/mariadb/libmariadbclient.a
+rm %{buildroot}%{_libdir}/mariadb/libmysqlclient.a
+rm %{buildroot}%{_libdir}/mariadb/libmysqlclient_r.a
 
 %files -n %{libname}%{sover}
 %defattr(-,root,root)
 %doc README COPYING.LIB
-%{_libdir}/libmariadb.so.%{sover}
+%{_libdir}/mariadb/libmariadb.so.%{sover}
 
 %files -n %{libname}_plugins
 %dir %{_libdir}/mariadb/
@@ -137,15 +137,15 @@ rm %{buildroot}%{_libdir}/libmysqlclient_r.a
 %{_libdir}/mariadb/plugin/sha256_password.so
 
 %files -n %{libname}private
-%{_libdir}/libmariadbprivate.so
+%{_libdir}/mariadb/libmariadbprivate.so
 
 %files -n %{libname}-devel
 %defattr(-,root,root)
 %{_bindir}/mariadb_config
 %{_includedir}/mariadb/
-%{_libdir}/libmariadb.so
-%{_libdir}/libmysqlclient.so
-%{_libdir}/libmysqlclient_r.so
+%{_libdir}/mariadb/libmariadb.so
+%{_libdir}/mariadb/libmysqlclient.so
+%{_libdir}/mariadb/libmysqlclient_r.so
 
 %post   -n %{libname}%{sover} -p /sbin/ldconfig
 %post   -n %{libname}private -p /sbin/ldconfig