X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=mysql.spec;h=b0652aa9fb2be97c50c32fad054616d53f0de297;hb=5672744936f5b3c15edbd71ec3ae6c1acc1617e0;hp=b2498d8ab2bd3abc56601aeb9bcac313596a5110;hpb=04fe46407e0117c7aac2cc8e076430809fb54dcf;p=packages%2Fmysql.git

diff --git a/mysql.spec b/mysql.spec
index b2498d8..b0652aa 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -52,6 +52,7 @@ Source13:	mysql-client.conf
 Source14:	my.cnf
 Patch0:		no_relative_paths.patch
 Patch1:		mysql-system-xxhash.patch
+Patch2:		zlib.patch
 
 Patch17:	mysql-5.7-sphinx.patch
 Patch18:	mysql-sphinx.patch
@@ -467,6 +468,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %if %{with sphinx}
 # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
@@ -803,6 +805,16 @@ if [ $1 -eq 0 ]; then
 	update-alternatives --remove mysqldumpslow %{_libdir}/mysql/%{mysqlversion}/bin/mysqldumpslow || :
 fi
 
+%posttrans -n mysql-devel
+update-alternatives \
+	--install %{_bindir}/mysql_config mysql_config %{_libdir}/mysql/%{mysqlversion}/bin/mysql_config %{mysqlpriority} \
+	--slave %{_mandir}/man1/mysql_config.1 mysql_config.1 %{_datadir}/mysql/%{mysqlversion}/man/man1/mysql_config.1* || :
+
+%postun -n mysql-devel
+if [ $1 -eq 0 ]; then
+	update-alternatives --remove mysql_config %{_libdir}/mysql/%{mysqlversion}/bin/mysql_config || :
+fi
+
 %post ndb
 /sbin/chkconfig --add %{name}-ndb
 %service %{name}-ndb restart "%{name} NDB engine"
@@ -1087,9 +1099,9 @@ fi
 %dir %{_libdir}/mysql
 %dir %{_datadir}/mysql
 %attr(751,root,root) %dir /var/lib/mysql
-%attr(750,root,root) %dir /var/lib/mysql-files
-%attr(750,root,root) %dir /var/log/mysql
-%attr(750,root,root) %dir /var/log/archive/mysql
+%attr(751,root,root) %dir /var/lib/mysql-files
+%attr(751,root,root) %dir /var/log/mysql
+%attr(751,root,root) %dir /var/log/archive/mysql
 
 %files dirs
 %defattr(644,root,root,755)