Change libdir from .../lib64/mariadb to mysql

Related: #1497234
This commit is contained in:
Michal Schorm 2017-10-03 02:06:15 +02:00
parent 26400422d8
commit 3f6ef0117b

View File

@ -1,6 +1,6 @@
Name: mariadb-connector-c
Version: 3.0.2
Release: 8%{?dist}
Release: 9%{?dist}
Summary: The MariaDB Native Client library (C driver)
Group: Applications/Databases
License: LGPLv2+
@ -77,7 +77,9 @@ rm %{buildroot}%{_libdir}/mariadb/libmysqlclient_r.a
# add a compatibility symlink
ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config
ln -s mariadb %{buildroot}%{_libdir}/mysql
mv %{buildroot}%{_libdir}/mariadb %{buildroot}%{_libdir}/mysql
ln -s mysql %{buildroot}%{_libdir}/mariadb
ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql_version.h
# move header files to the same location, as they would be in mariadb-server (10.2.8)
@ -92,9 +94,9 @@ mv %{buildroot}%{_includedir}/temporary %{buildroot}%{_includedir}/mysql
%files
%{_libdir}/mariadb/libmariadb.so.*
%dir %{_libdir}/mariadb/plugin
%{_libdir}/mariadb/plugin/*
%{_libdir}/mysql/libmariadb.so.*
%dir %{_libdir}/mysql/plugin
%{_libdir}/mysql/plugin/*
# fix of RPATH. If there is a set config file, libdir/mariadb/ is added to search for libraries
%config(noreplace) %{_sysconfdir}/ld.so.conf.d
@ -109,11 +111,11 @@ mv %{buildroot}%{_includedir}/temporary %{buildroot}%{_includedir}/mysql
%{_bindir}/mariadb_config
%{_bindir}/mysql_config
%dir %{_libdir}/mariadb
%{_libdir}/mysql
%{_libdir}/mariadb/libmariadb.so
%{_libdir}/mariadb/libmysqlclient.so
%{_libdir}/mariadb/libmysqlclient_r.so
%dir %{_libdir}/mysql
%{_libdir}/mariadb
%{_libdir}/mysql/libmariadb.so
%{_libdir}/mysql/libmysqlclient.so
%{_libdir}/mysql/libmysqlclient_r.so
# header files
%{_includedir}/*
@ -121,8 +123,10 @@ mv %{buildroot}%{_includedir}/temporary %{buildroot}%{_includedir}/mysql
%license COPYING.LIB
%changelog
* Wed Sep 20 2017 Michal Schorm <mschorm@redhat.com> - 3.0.2-8
* Wed Sep 20 2017 Michal Schorm <mschorm@redhat.com> - 3.0.2-9
- Add symlinks so more packages will build succesfully
- Change libdir from .../lib64/mariadb to mysql
Related: #1497234
* Wed Sep 13 2017 Michal Schorm <mschorm@redhat.com> - 3.0.2-7
- Move header files to the same location, as they would be in mariadb-server