Attachment 899702 Details for Bug 1101759 – Drop superfluous -libs and -embedded ldconfig deps

[patch] Drop superfluous -libs and -embedded ldconfig deps

Drop-superfluous--libs-and--embedded-ldconfig-deps.patch (text/plain), 2.43 KB, created by Ville Skyttä on 2014-05-27 20:35:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-05-27 20:35:25 UTC

Size: 2.43 KB

patch

obsolete

>From a84f18296e2891f5a482278bf011dd7ee65cb020 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Tue, 27 May 2014 23:34:16 +0300
>Subject: [PATCH] Drop superfluous -libs and -embedded ldconfig deps
>
>---
> mariadb.spec | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/mariadb.spec b/mariadb.spec
>index 6b87552..5139280 100644
>--- a/mariadb.spec
>+++ b/mariadb.spec
>@@ -7,7 +7,7 @@
> 
> Name: mariadb
> Version: 10.0.11
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> Epoch: 1
> 
> Summary: A community developed branch of MySQL
>@@ -117,7 +117,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}
>@@ -184,7 +183,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}
>@@ -543,7 +541,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.
>@@ -807,6 +805,9 @@ fi
> %{_mandir}/man1/mysql_client_test.1*
> 
> %changelog
>+* Tue May 27 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1:10.0.11-2
>+- Drop superfluous -libs and -embedded ldconfig deps
>+
> * Wed May 14 2014 Jakub DorÅÃ¡k <jdornak@redhat.com> - 1:10.0.11-1
> - Rebase to version 10.0.11
> 
>@@ -982,7 +983,7 @@ fi
>   Resolves: #975348
> 
> * Fri Jun 14 2013 Honza Horak <hhorak@redhat.com> 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 <hhorak@redhat.com> 1:5.5.31-2
>-- 
>1.9.3

Actions: View | Diff

Attachments on bug 1101759: 899702