diff --git a/mysql.spec b/mysql.spec index 3e9fdca..628ca65 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,6 +1,6 @@ Name: mysql Version: 5.5.29 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MySQL client programs and shared libraries Group: Applications/Databases @@ -71,6 +71,11 @@ Requires: grep, fileutils Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: bash +# We can use real- prefix to distinguish from other MySQL implementations +# like MariaDB unambiguously +Provides: real-%{name} = %{version}-%{release} +Provides: real-%{name}%{?_isa} = %{version}-%{release} + # MySQL (with caps) is upstream's spelling of their own RPMs for mysql Conflicts: MySQL # mysql-cluster used to be built from this SRPM, but no more @@ -95,6 +100,8 @@ contains the standard MySQL client programs and generic MySQL files. Summary: The shared libraries required for MySQL clients Group: Applications/Databases Requires: /sbin/ldconfig +Provides: real-%{name}-libs = %{version}-%{release} +Provides: real-%{name}-libs%{?_isa} = %{version}-%{release} %description libs The mysql-libs package provides the essential shared libraries for any @@ -125,6 +132,8 @@ Requires(post): systemd-sysv # mysqlhotcopy needs DBI/DBD support Requires: perl-DBI, perl-DBD-MySQL Conflicts: MySQL-server +Provides: real-%{name}-server = %{version}-%{release} +Provides: real-%{name}-server%{?_isa} = %{version}-%{release} %description server MySQL is a multi-user, multi-threaded SQL database server. MySQL is a @@ -140,6 +149,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: openssl-devel%{?_isa} Conflicts: MySQL-devel +Provides: real-%{name}-devel = %{version}-%{release} +Provides: real-%{name}-devel%{?_isa} = %{version}-%{release} %description devel MySQL is a multi-user, multi-threaded SQL database server. This @@ -150,6 +161,8 @@ developing MySQL client applications. Summary: MySQL as an embeddable library Group: Applications/Databases +Provides: real-%{name}-embedded = %{version}-%{release} +Provides: real-%{name}-embedded%{?_isa} = %{version}-%{release} %description embedded MySQL is a multi-user, multi-threaded SQL database server. This @@ -162,6 +175,8 @@ Summary: Development files for MySQL as an embeddable library Group: Applications/Databases Requires: %{name}-embedded%{?_isa} = %{version}-%{release} Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Provides: real-%{name}-embedded-devel = %{version}-%{release} +Provides: real-%{name}-embedded-devel%{?_isa} = %{version}-%{release} %description embedded-devel MySQL is a multi-user, multi-threaded SQL database server. This @@ -174,6 +189,8 @@ Summary: MySQL benchmark scripts and data Group: Applications/Databases Requires: %{name}%{?_isa} = %{version}-%{release} Conflicts: MySQL-bench +Provides: real-%{name}-bench = %{version}-%{release} +Provides: real-%{name}-bench%{?_isa} = %{version}-%{release} %description bench MySQL is a multi-user, multi-threaded SQL database server. This @@ -188,6 +205,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-server%{?_isa} = %{version}-%{release} Conflicts: MySQL-test +Provides: real-%{name}-test = %{version}-%{release} +Provides: real-%{name}-test%{?_isa} = %{version}-%{release} %description test MySQL is a multi-user, multi-threaded SQL database server. This @@ -707,6 +726,10 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog +* Mon Feb 11 2013 Honza Horak 5.5.29-2 +- Provide own symbols with real- prefix to distinguish packages from other + MySQL implementations unambiguously + * Wed Jan 2 2013 Tom Lane 5.5.29-1 - Update to MySQL 5.5.29, for various fixes described at http://dev.mysql.com/doc/refman/5.5/en/news-5-5-29.html