hhorak pushed to mariadb (f22). "Do not include symlink to libmysqlclient if not shipping the library (..more)"

[notifications at fedoraproject.org]

From 4568299fc7799b7e85b9db57b7755955e9c25b9e Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak at redhat.com>
Date: Tue, 27 Jan 2015 17:27:50 +0100
Subject: Do not include symlink to libmysqlclient if not shipping the library

Conflicts:
	mariadb.spec

diff --git a/mariadb.spec b/mariadb.spec
index 75ecca9..1d5e4b2 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -749,6 +749,8 @@ rm -f %{buildroot}%{_sysconfdir}/logrotate.d/mysql
 rm -rf %{buildroot}%{_datadir}/%{pkg_name}/solaris/
 
 %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
@@ -1104,8 +1106,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
 
@@ -1138,6 +1142,7 @@ fi
 * Fri Mar 06 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.17-2
 - Wait for daemon ends
   Resolves: #1072958
+- Do not include symlink to libmysqlclient if not shipping the library
 
 * Wed Mar 04 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.17-1
 - Rebase to version 10.0.17
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mariadb.git/commit/?h=f22&id=4568299fc7799b7e85b9db57b7755955e9c25b9e