From c6e30efe80b1e255c3ed9b8b197022a4d6d96c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Tue, 12 Feb 2013 12:30:39 +0100 Subject: [PATCH] Use real- prefix for cross-package requirements --- mysql.spec | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/mysql.spec b/mysql.spec index 628ca65..29c1f45 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,6 +1,6 @@ Name: mysql Version: 5.5.29 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases @@ -68,7 +68,7 @@ BuildRequires: perl(Socket), perl(Time::HiRes) BuildRequires: systemd-units Requires: grep, fileutils -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: real-%{name}-libs%{?_isa} = %{version}-%{release} Requires: bash # We can use real- prefix to distinguish from other MySQL implementations @@ -113,8 +113,8 @@ MySQL server. Summary: The MySQL server and related files Group: Applications/Databases -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: real-%{name}%{?_isa} = %{version}-%{release} +Requires: real-%{name}-libs%{?_isa} = %{version}-%{release} Requires: sh-utils Requires(pre): /usr/sbin/useradd Requires(post): chkconfig @@ -145,8 +145,8 @@ the MySQL server and some accompanying files and directories. Summary: Files for development of MySQL applications Group: Applications/Databases -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: real-%{name}%{?_isa} = %{version}-%{release} +Requires: real-%{name}-libs%{?_isa} = %{version}-%{release} Requires: openssl-devel%{?_isa} Conflicts: MySQL-devel Provides: real-%{name}-devel = %{version}-%{release} @@ -173,8 +173,8 @@ into a client application instead of running as a separate process. Summary: Development files for MySQL as an embeddable library Group: Applications/Databases -Requires: %{name}-embedded%{?_isa} = %{version}-%{release} -Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: real-%{name}-embedded%{?_isa} = %{version}-%{release} +Requires: real-%{name}-devel%{?_isa} = %{version}-%{release} Provides: real-%{name}-embedded-devel = %{version}-%{release} Provides: real-%{name}-embedded-devel%{?_isa} = %{version}-%{release} @@ -187,7 +187,7 @@ the embedded version of the MySQL server. Summary: MySQL benchmark scripts and data Group: Applications/Databases -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: real-%{name}%{?_isa} = %{version}-%{release} Conflicts: MySQL-bench Provides: real-%{name}-bench = %{version}-%{release} Provides: real-%{name}-bench%{?_isa} = %{version}-%{release} @@ -201,9 +201,9 @@ MySQL. Summary: The test suite distributed with MySQL Group: Applications/Databases -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-server%{?_isa} = %{version}-%{release} +Requires: real-%{name}%{?_isa} = %{version}-%{release} +Requires: real-%{name}-libs%{?_isa} = %{version}-%{release} +Requires: real-%{name}-server%{?_isa} = %{version}-%{release} Conflicts: MySQL-test Provides: real-%{name}-test = %{version}-%{release} Provides: real-%{name}-test%{?_isa} = %{version}-%{release} @@ -726,6 +726,9 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog +* Tue Feb 12 2013 Honza Horak 5.5.29-3 +- Use real- prefix for cross-package requirements + * Mon Feb 11 2013 Honza Horak 5.5.29-2 - Provide own symbols with real- prefix to distinguish packages from other MySQL implementations unambiguously