diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 764f5ab..1bc2dd7 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,6 +1,6 @@ Name: mariadb-connector-c Version: 3.0.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: The MariaDB Native Client library (C driver) Group: Applications/Databases License: LGPLv2+ @@ -88,6 +88,23 @@ mkdir %{buildroot}%{_includedir}/temporary mv %{buildroot}%{_includedir}/{*.h,mysql,mariadb} %{buildroot}%{_includedir}/temporary mv %{buildroot}%{_includedir}/temporary %{buildroot}%{_includedir}/mysql + + +%pre devel +rpm -qf /usr/lib64/mysql +if [ $? -eq 1 ]; then + if [ "$(ls -A /usr/lib64/mysql)" ]; then + mv /usr/lib64/mysql /usr/lib64/.mysql_update_tmp + fi + rm -rf /usr/lib64/{mysql*,mariadb*} +fi + +%post devel +if [ "$(ls -A /usr/lib64/.mysql_update_tmp)" ]; then + mv /usr/lib64/.mysql_update_tmp/* /usr/lib64/mysql + rm -rf /usr/lib64/.mysql_update_tmp +fi + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -123,6 +140,10 @@ mv %{buildroot}%{_includedir}/temporary %{buildroot}%{_includedir}/mysql %license COPYING.LIB %changelog +* Wed Oct 04 2017 Michal Schorm - 3.0.2-10 +- Add scriptlets to handle errors in /usr/lib64/ created by older versions + of mariadb and mariadb-connector-c pakages + * Wed Sep 20 2017 Michal Schorm - 3.0.2-9 - Add symlinks so more packages will build succesfully - Change libdir from .../lib64/mariadb to mysql