From 6830987ad3d050d76afc3aecd27972d33cef571d Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Thu, 17 Jul 2014 13:46:57 +0200 Subject: [PATCH] =?UTF-8?q?Drop=20superfluous=20-libs=20and=20-embedded=20?= =?UTF-8?q?ldconfig=20deps=20(thanks=20Ville=20Skytt=C3=A4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mariadb.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 9cd79b8..31a5c63 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -132,7 +132,6 @@ contains the standard MariaDB/MySQL client programs and generic MySQL files. Summary: The shared libraries required for MariaDB/MySQL clients Group: Applications/Databases -Requires: /sbin/ldconfig Provides: mysql-libs = %{epoch}:%{version}-%{release} Provides: mysql-libs%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: MySQL-libs < %{obsoleted_mysql_case_evr} @@ -199,7 +198,6 @@ MariaDB is a community developed branch of MySQL. Summary: MariaDB as an embeddable library Group: Applications/Databases -Requires: /sbin/ldconfig Provides: mysql-embedded = %{epoch}:%{version}-%{release} Provides: mysql-embedded%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: MySQL-embedded < %{obsoleted_mysql_case_evr} @@ -568,7 +566,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}/solaris/ /usr/sbin/useradd -M -N -g mysql -o -r -d %{_localstatedir}/lib/mysql -s /sbin/nologin \ -c "MariaDB Server" -u 27 mysql >/dev/null 2>&1 || : -# Explicitly enable mysqld if it was enabled in the beggining +# Explicitly enable mysqld if it was enabled in the beginning # of the transaction. Otherwise mysqld is disabled always when # replacing mysql with mariadb, because it is not recognized # as updating, but rather as removal and install. @@ -833,6 +831,7 @@ fi - Enable OQGRAPH engine - Enable TokuDB engine for x86_64 - Re-enable tokudb_innodb_xa_crash again, seems to be fixed now +- Drop superfluous -libs and -embedded ldconfig deps (thanks Ville Skyttä) * Wed Jun 18 2014 Mikko Tiihonen - 1:10.0.12-2 - Use -fno-delete-null-pointer-checks to avoid segfaults with gcc 4.9 @@ -1024,7 +1023,7 @@ fi Resolves: #975348 * Fri Jun 14 2013 Honza Horak 1:5.5.31-3 -- Explicitly enable mysqld if it was enabled in the beggining +- Explicitly enable mysqld if it was enabled in the beginning of the transaction. * Thu Jun 13 2013 Honza Horak 1:5.5.31-2