[mariadb-galera] Do not include symlink to libmysqlclient if not shipping the library

Honza Horak hhorak at fedoraproject.org
Wed Mar 11 22:55:04 UTC 2015


commit 18d6d88f8f5d01053430815c747dcd97659d8974
Author: Honza Horak <hhorak at redhat.com>
Date:   Tue Jan 27 17:27:50 2015 +0100

    Do not include symlink to libmysqlclient if not shipping the library
    
    Conflicts:
    	mariadb-galera.spec

 mariadb-galera.spec | 5 +++++
 1 file changed, 5 insertions(+)
---
diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index c30f493..2ec83bb 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -788,6 +788,8 @@ rm -rf %{buildroot}%{_datadir}/%{pkg_name}/solaris/
 mv Docs/README-wsrep Docs/README.wsrep
 
 %if %{without clibrary}
+unlink %{buildroot}%{_libdir}/mysql/libmysqlclient.so
+unlink %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so
 rm -rf %{buildroot}%{_libdir}/mysql/libmysqlclient*.so.*
 rm -rf %{buildroot}%{_sysconfdir}/ld.so.conf.d
 rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
@@ -1156,8 +1158,10 @@ fi
 %{_bindir}/mysql_config-%{__isa_bits}
 %{_includedir}/mysql
 %{_datadir}/aclocal/mysql.m4
+%if %{with clibrary}
 %{_libdir}/mysql/libmysqlclient.so
 %{_libdir}/mysql/libmysqlclient_r.so
+%endif
 %{_mandir}/man1/mysql_config.1*
 %endif
 
@@ -1197,6 +1201,7 @@ fi
 - Added variable for turn off skipping some tests
 - Wait for daemon ends
   Resolves: #1072958
+- Do not include symlink to libmysqlclient if not shipping the library
 
 * Sun Jan 25 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.15-3
 - Do not create log file in post script


More information about the scm-commits mailing list