Skip to content

M
MariaDB
Commit 4a3f1c1f authored by Terje Rosten's avatar Terje Rosten
Browse files
Options

BUG#17903583 MYSQL-COMMUNITY-SERVER SHOULD NOT DEPEND ON MYSQL-COMMUNITY-CLIENT (#70985) 

Fix is a backport of BUG#18518216/72230 to MySQL 5.5 and 5.6.

Will also resolve:

 BUG#23605713/81384 LIBMYSQLCLIENT.SO.18 MISSING FROM MYSQL 5.7

  as mysql-community-libs-5.5 or mysql-community-libs-5.6 can
  installed on EL6 system with libmysqlclient.16 (from MySQL 5.1)
  libmysqlclient.20 (from MySQL 5.7) by doing:

  $ rpm --oldpackage -ivh mysql-community-libs-5.5.50-2.el6.x86_64.rpm

  Providing a way to have several versions of libmysqlclient installed
  on the same system.

and help:

 BUG#23088014/80981 LIBS-COMPAT RPMS SHOULD BE INDEPENDENT OF ALL OTHER SUBPACKAGES

  due to less strict coupling between -libs-compat and -common package.
parent 957aefdc
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 45 deletions
packaging/rpm-oel/mysql.spec.in
View file @ 4a3f1c1f
...@@ -81,6 +81,8 @@ ...@@ -81,6 +81,8 @@
%global license_type GPLv2 %global license_type GPLv2
%endif %endif
%global min 5.5.8
Name: mysql-%{product_suffix} Name: mysql-%{product_suffix}
Summary: A very fast and reliable SQL database server Summary: A very fast and reliable SQL database server
Group: Applications/Databases Group: Applications/Databases
...@@ -156,11 +158,11 @@ Requires: net-tools ...@@ -156,11 +158,11 @@ Requires: net-tools
Provides: MySQL-server-advanced%{?_isa} = %{version}-%{release} Provides: MySQL-server-advanced%{?_isa} = %{version}-%{release}
Obsoletes: MySQL-server-advanced < %{version}-%{release} Obsoletes: MySQL-server-advanced < %{version}-%{release}
Obsoletes: mysql-community-server < %{version}-%{release} Obsoletes: mysql-community-server < %{version}-%{release}
Requires: mysql-commercial-client%{?_isa} = %{version}-%{release} Requires: mysql-commercial-client%{?_isa} >= %{min}
Requires: mysql-commercial-common%{?_isa} = %{version}-%{release} Requires: mysql-commercial-common%{?_isa} = %{version}-%{release}
%else %else
Provides: MySQL-server%{?_isa} = %{version}-%{release} Provides: MySQL-server%{?_isa} = %{version}-%{release}
Requires: mysql-community-client%{?_isa} = %{version}-%{release} Requires: mysql-community-client%{?_isa} >= %{min}
Requires: mysql-community-common%{?_isa} = %{version}-%{release} Requires: mysql-community-common%{?_isa} = %{version}-%{release}
%endif %endif
Obsoletes: MySQL-server < %{version}-%{release} Obsoletes: MySQL-server < %{version}-%{release}
...@@ -209,10 +211,10 @@ Group: Applications/Databases ...@@ -209,10 +211,10 @@ Group: Applications/Databases
Provides: MySQL-client-advanced%{?_isa} = %{version}-%{release} Provides: MySQL-client-advanced%{?_isa} = %{version}-%{release}
Obsoletes: MySQL-client-advanced < %{version}-%{release} Obsoletes: MySQL-client-advanced < %{version}-%{release}
Obsoletes: mysql-community-client < %{version}-%{release} Obsoletes: mysql-community-client < %{version}-%{release}
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release} Requires: mysql-commercial-libs%{?_isa} >= %{min}
%else %else
Provides: MySQL-client%{?_isa} = %{version}-%{release} Provides: MySQL-client%{?_isa} = %{version}-%{release}
Requires: mysql-community-libs%{?_isa} = %{version}-%{release} Requires: mysql-community-libs%{?_isa} >= %{min}
%endif %endif
Obsoletes: MySQL-client < %{version}-%{release} Obsoletes: MySQL-client < %{version}-%{release}
Obsoletes: mariadb Obsoletes: mariadb
...@@ -234,7 +236,7 @@ Obsoletes: mysql-community-common < %{version}-%{release} ...@@ -234,7 +236,7 @@ Obsoletes: mysql-community-common < %{version}-%{release}
%endif %endif
Provides: mysql-common = %{version}-%{release} Provides: mysql-common = %{version}-%{release}
Provides: mysql-common%{?_isa} = %{version}-%{release} Provides: mysql-common%{?_isa} = %{version}-%{release}
%{?el5:Requires: mysql%{?_isa} = %{version}-%{release}} %{?el5:Requires: mysql%{?_isa} >= %{min}}
%description common %description common
This packages contains common files needed by MySQL client library, This packages contains common files needed by MySQL client library,
...@@ -248,10 +250,10 @@ Group: Applications/Databases ...@@ -248,10 +250,10 @@ Group: Applications/Databases
Provides: MySQL-test-advanced%{?_isa} = %{version}-%{release} Provides: MySQL-test-advanced%{?_isa} = %{version}-%{release}
Obsoletes: MySQL-test-advanced < %{version}-%{release} Obsoletes: MySQL-test-advanced < %{version}-%{release}
Obsoletes: mysql-community-test < %{version}-%{release} Obsoletes: mysql-community-test < %{version}-%{release}
Requires: mysql-commercial-server%{?_isa} = %{version}-%{release} Requires: mysql-commercial-server%{?_isa} >= %{min}
%else %else
Provides: MySQL-test%{?_isa} = %{version}-%{release} Provides: MySQL-test%{?_isa} = %{version}-%{release}
Requires: mysql-community-server%{?_isa} = %{version}-%{release} Requires: mysql-community-server%{?_isa} >= %{min}
%endif %endif
Obsoletes: MySQL-test < %{version}-%{release} Obsoletes: MySQL-test < %{version}-%{release}
Obsoletes: mysql-test < %{version}-%{release} Obsoletes: mysql-test < %{version}-%{release}
...@@ -270,9 +272,9 @@ Summary: MySQL benchmark suite ...@@ -270,9 +272,9 @@ Summary: MySQL benchmark suite
Group: Applications/Databases Group: Applications/Databases
%if 0%{?commercial} %if 0%{?commercial}
Obsoletes: mysql-community-bench < %{version}-%{release} Obsoletes: mysql-community-bench < %{version}-%{release}
Requires: mysql-commercial-server%{?_isa} = %{version}-%{release} Requires: mysql-commercial-server%{?_isa} >= %{min}
%else %else
Requires: mysql-community-server%{?_isa} = %{version}-%{release} Requires: mysql-community-server%{?_isa} >= %{min}
%endif %endif
Obsoletes: mariadb-bench Obsoletes: mariadb-bench
Obsoletes: community-mysql-bench < %{version}-%{release} Obsoletes: community-mysql-bench < %{version}-%{release}
...@@ -291,10 +293,10 @@ Group: Applications/Databases ...@@ -291,10 +293,10 @@ Group: Applications/Databases
Provides: MySQL-devel-advanced%{?_isa} = %{version}-%{release} Provides: MySQL-devel-advanced%{?_isa} = %{version}-%{release}
Obsoletes: MySQL-devel-advanced < %{version}-%{release} Obsoletes: MySQL-devel-advanced < %{version}-%{release}
Obsoletes: mysql-community-devel < %{version}-%{release} Obsoletes: mysql-community-devel < %{version}-%{release}
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release} Requires: mysql-commercial-libs%{?_isa} >= %{min}
%else %else
Provides: MySQL-devel%{?_isa} = %{version}-%{release} Provides: MySQL-devel%{?_isa} = %{version}-%{release}
Requires: mysql-community-libs%{?_isa} = %{version}-%{release} Requires: mysql-community-libs%{?_isa} >= %{min}
%endif %endif
Obsoletes: MySQL-devel < %{version}-%{release} Obsoletes: MySQL-devel < %{version}-%{release}
Obsoletes: mysql-devel < %{version}-%{release} Obsoletes: mysql-devel < %{version}-%{release}
...@@ -314,10 +316,10 @@ Group: Applications/Databases ...@@ -314,10 +316,10 @@ Group: Applications/Databases
Provides: MySQL-shared-advanced%{?_isa} = %{version}-%{release} Provides: MySQL-shared-advanced%{?_isa} = %{version}-%{release}
Obsoletes: MySQL-shared-advanced < %{version}-%{release} Obsoletes: MySQL-shared-advanced < %{version}-%{release}
Obsoletes: mysql-community-libs < %{version}-%{release} Obsoletes: mysql-community-libs < %{version}-%{release}
Requires: mysql-commercial-common%{?_isa} = %{version}-%{release} Requires: mysql-commercial-common%{?_isa} >= %{min}
%else %else
Provides: MySQL-shared%{?_isa} = %{version}-%{release} Provides: MySQL-shared%{?_isa} = %{version}-%{release}
Requires: mysql-community-common%{?_isa} = %{version}-%{release} Requires: mysql-community-common%{?_isa} >= %{min}
%endif %endif
Obsoletes: MySQL-shared < %{version}-%{release} Obsoletes: MySQL-shared < %{version}-%{release}
Obsoletes: mysql-libs < %{version}-%{release} Obsoletes: mysql-libs < %{version}-%{release}
...@@ -341,10 +343,10 @@ Provides: mysql-libs-compat%{?_isa} = %{version}-%{release} ...@@ -341,10 +343,10 @@ Provides: mysql-libs-compat%{?_isa} = %{version}-%{release}
Provides: MySQL-shared-compat-advanced%{?_isa} = %{version}-%{release} Provides: MySQL-shared-compat-advanced%{?_isa} = %{version}-%{release}
Obsoletes: MySQL-shared-compat-advanced < %{version}-%{release} Obsoletes: MySQL-shared-compat-advanced < %{version}-%{release}
Obsoletes: mysql-community-libs-compat < %{version}-%{release} Obsoletes: mysql-community-libs-compat < %{version}-%{release}
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release} Requires: mysql-commercial-libs%{?_isa} >= %{min}
%else %else
Provides: MySQL-shared-compat%{?_isa} = %{version}-%{release} Provides: MySQL-shared-compat%{?_isa} = %{version}-%{release}
Requires: mysql-community-libs%{?_isa} = %{version}-%{release} Requires: mysql-community-libs%{?_isa} >= %{min}
%endif %endif
Obsoletes: MySQL-shared-compat < %{version}-%{release} Obsoletes: MySQL-shared-compat < %{version}-%{release}
%if 0%{?rhel} > 5 %if 0%{?rhel} > 5
...@@ -391,11 +393,11 @@ Summary: Development header files and libraries for MySQL as an embeddabl ...@@ -391,11 +393,11 @@ Summary: Development header files and libraries for MySQL as an embeddabl
Group: Applications/Databases Group: Applications/Databases
%if 0%{?commercial} %if 0%{?commercial}
Obsoletes: mysql-community-embedded-devel < %{version}-%{release} Obsoletes: mysql-community-embedded-devel < %{version}-%{release}
Requires: mysql-commercial-devel%{?_isa} = %{version}-%{release} Requires: mysql-commercial-devel%{?_isa} >= %{min}
Requires: mysql-commercial-embedded%{?_isa} = %{version}-%{release} Requires: mysql-commercial-embedded%{?_isa} >= %{min}
%else %else
Requires: mysql-community-devel%{?_isa} = %{version}-%{release} Requires: mysql-community-devel%{?_isa} >= %{min}
Requires: mysql-community-embedded%{?_isa} = %{version}-%{release} Requires: mysql-community-embedded%{?_isa} >= %{min}
%endif %endif
Obsoletes: mariadb-embedded-devel Obsoletes: mariadb-embedded-devel
Obsoletes: mysql-embedded-devel < %{version}-%{release} Obsoletes: mysql-embedded-devel < %{version}-%{release}
...@@ -411,13 +413,13 @@ the embedded version of the MySQL server. ...@@ -411,13 +413,13 @@ the embedded version of the MySQL server.
Summary: Convenience package for easy upgrades of MySQL package set Summary: Convenience package for easy upgrades of MySQL package set
Group: Applications/Databases Group: Applications/Databases
%if 0%{?commercial} %if 0%{?commercial}
Requires: mysql-commercial-client%{?_isa} = %{version}-%{release} Requires: mysql-commercial-client%{?_isa} >= %{min}
Requires: mysql-commercial-libs%{?_isa} = %{version}-%{release} Requires: mysql-commercial-libs%{?_isa} >= %{min}
Requires: mysql-commercial-libs-compat%{?_isa} = %{version}-%{release} Requires: mysql-commercial-libs-compat%{?_isa} >= %{min}
%else %else
Requires: mysql-community-client%{?_isa} = %{version}-%{release} Requires: mysql-community-client%{?_isa} >= %{min}
Requires: mysql-community-libs%{?_isa} = %{version}-%{release} Requires: mysql-community-libs%{?_isa} >= %{min}
Requires: mysql-community-libs-compat%{?_isa} = %{version}-%{release} Requires: mysql-community-libs-compat%{?_isa} >= %{min}
%endif %endif
%description -n mysql %description -n mysql
......
packaging/rpm-sles/mysql.spec.in
View file @ 4a3f1c1f
...@@ -57,6 +57,8 @@ ...@@ -57,6 +57,8 @@
%global sles11 1 %global sles11 1
%endif %endif
%global min 5.5.8
Name: mysql-%{product_suffix} Name: mysql-%{product_suffix}
Summary: A very fast and reliable SQL database server Summary: A very fast and reliable SQL database server
Group: Applications/Databases Group: Applications/Databases
...@@ -125,12 +127,12 @@ Requires: perl-base ...@@ -125,12 +127,12 @@ Requires: perl-base
Provides: MySQL-server-advanced = %{version}-%{release} Provides: MySQL-server-advanced = %{version}-%{release}
Obsoletes: MySQL-server-advanced < %{version}-%{release} Obsoletes: MySQL-server-advanced < %{version}-%{release}
Obsoletes: mysql-community-server < %{version}-%{release} Obsoletes: mysql-community-server < %{version}-%{release}
Requires: mysql-commercial-client = %{version}-%{release} Requires: mysql-commercial-client >= %{min}
Requires: mysql-commercial-common = %{version}-%{release} Requires: mysql-commercial-common >= %{min}
%else %else
Provides: MySQL-server = %{version}-%{release} Provides: MySQL-server = %{version}-%{release}
Requires: mysql-community-client = %{version}-%{release} Requires: mysql-community-client >= %{min}
Requires: mysql-community-common = %{version}-%{release} Requires: mysql-community-common >= %{min}
%endif %endif
Obsoletes: MySQL-server < %{version}-%{release} Obsoletes: MySQL-server < %{version}-%{release}
Obsoletes: mysql < %{version}-%{release} Obsoletes: mysql < %{version}-%{release}
...@@ -180,10 +182,10 @@ Group: Applications/Databases ...@@ -180,10 +182,10 @@ Group: Applications/Databases
Provides: MySQL-client-advanced = %{version}-%{release} Provides: MySQL-client-advanced = %{version}-%{release}
Obsoletes: MySQL-client-advanced < %{version}-%{release} Obsoletes: MySQL-client-advanced < %{version}-%{release}
Obsoletes: mysql-community-client < %{version}-%{release} Obsoletes: mysql-community-client < %{version}-%{release}
Requires: mysql-commercial-libs = %{version}-%{release} Requires: mysql-commercial-libs >= %{min}
%else %else
Provides: MySQL-client = %{version}-%{release} Provides: MySQL-client = %{version}-%{release}
Requires: mysql-community-libs = %{version}-%{release} Requires: mysql-community-libs >= %{min}
%endif %endif
Obsoletes: MySQL-client < %{version}-%{release} Obsoletes: MySQL-client < %{version}-%{release}
Provides: mysql-client = %{version}-%{release} Provides: mysql-client = %{version}-%{release}
...@@ -215,10 +217,10 @@ Group: Applications/Databases ...@@ -215,10 +217,10 @@ Group: Applications/Databases
Provides: MySQL-test-advanced = %{version}-%{release} Provides: MySQL-test-advanced = %{version}-%{release}
Obsoletes: MySQL-test-advanced < %{version}-%{release} Obsoletes: MySQL-test-advanced < %{version}-%{release}
Obsoletes: mysql-community-test < %{version}-%{release} Obsoletes: mysql-community-test < %{version}-%{release}
Requires: mysql-commercial-server = %{version}-%{release} Requires: mysql-commercial-server >= %{min}
%else %else
Provides: MySQL-test = %{version}-%{release} Provides: MySQL-test = %{version}-%{release}
Requires: mysql-community-server = %{version}-%{release} Requires: mysql-community-server >= %{min}
%endif %endif
Obsoletes: MySQL-test < %{version}-%{release} Obsoletes: MySQL-test < %{version}-%{release}
Obsoletes: mysql-test < %{version}-%{release} Obsoletes: mysql-test < %{version}-%{release}
...@@ -236,9 +238,9 @@ Summary: MySQL benchmark suite ...@@ -236,9 +238,9 @@ Summary: MySQL benchmark suite
Group: Applications/Databases Group: Applications/Databases
%if 0%{?commercial} %if 0%{?commercial}
Obsoletes: mysql-community-bench < %{version}-%{release} Obsoletes: mysql-community-bench < %{version}-%{release}
Requires: mysql-commercial-server = %{version}-%{release} Requires: mysql-commercial-server >= %{min}
%else %else
Requires: mysql-community-server = %{version}-%{release} Requires: mysql-community-server >= %{min}
%endif %endif
Obsoletes: mariadb-bench Obsoletes: mariadb-bench
Obsoletes: community-mysql-bench < %{version}-%{release} Obsoletes: community-mysql-bench < %{version}-%{release}
...@@ -257,10 +259,10 @@ Group: Applications/Databases ...@@ -257,10 +259,10 @@ Group: Applications/Databases
Provides: MySQL-devel-advanced = %{version}-%{release} Provides: MySQL-devel-advanced = %{version}-%{release}
Obsoletes: MySQL-devel-advanced < %{version}-%{release} Obsoletes: MySQL-devel-advanced < %{version}-%{release}
Obsoletes: mysql-community-devel < %{version}-%{release} Obsoletes: mysql-community-devel < %{version}-%{release}
Requires: mysql-commercial-libs = %{version}-%{release} Requires: mysql-commercial-libs >= %{min}
%else %else
Provides: MySQL-devel = %{version}-%{release} Provides: MySQL-devel = %{version}-%{release}
Requires: mysql-community-libs = %{version}-%{release} Requires: mysql-community-libs >= %{min}
%endif %endif
Obsoletes: MySQL-devel < %{version}-%{release} Obsoletes: MySQL-devel < %{version}-%{release}
Obsoletes: mysql-devel < %{version}-%{release} Obsoletes: mysql-devel < %{version}-%{release}
...@@ -281,10 +283,10 @@ Group: Applications/Databases ...@@ -281,10 +283,10 @@ Group: Applications/Databases
Provides: MySQL-shared-advanced = %{version}-%{release} Provides: MySQL-shared-advanced = %{version}-%{release}
Obsoletes: MySQL-shared-advanced < %{version}-%{release} Obsoletes: MySQL-shared-advanced < %{version}-%{release}
Obsoletes: mysql-community-libs < %{version}-%{release} Obsoletes: mysql-community-libs < %{version}-%{release}
Requires: mysql-commercial-common = %{version}-%{release} Requires: mysql-commercial-common >= %{min}
%else %else
Provides: MySQL-shared = %{version}-%{release} Provides: MySQL-shared = %{version}-%{release}
Requires: mysql-community-common = %{version}-%{release} Requires: mysql-community-common >= %{min}
%endif %endif
Obsoletes: MySQL-shared < %{version}-%{release} Obsoletes: MySQL-shared < %{version}-%{release}
Obsoletes: mysql-libs < %{version}-%{release} Obsoletes: mysql-libs < %{version}-%{release}
...@@ -307,10 +309,10 @@ Group: Applications/Databases ...@@ -307,10 +309,10 @@ Group: Applications/Databases
Provides: MySQL-embedded-advanced = %{version}-%{release} Provides: MySQL-embedded-advanced = %{version}-%{release}
Obsoletes: MySQL-embedded-advanced < %{version}-%{release} Obsoletes: MySQL-embedded-advanced < %{version}-%{release}
Obsoletes: mysql-community-embedded < %{version}-%{release} Obsoletes: mysql-community-embedded < %{version}-%{release}
Requires: mysql-commercial-common = %{version}-%{release} Requires: mysql-commercial-common >= %{min}
%else %else
Provides: MySQL-embedded = %{version}-%{release} Provides: MySQL-embedded = %{version}-%{release}
Requires: mysql-community-common = %{version}-%{release} Requires: mysql-community-common >= %{min}
%endif %endif
Obsoletes: mariadb-embedded Obsoletes: mariadb-embedded
Obsoletes: MySQL-embedded < %{version}-%{release} Obsoletes: MySQL-embedded < %{version}-%{release}
...@@ -334,11 +336,11 @@ Summary: Development header files and libraries for MySQL as an embeddabl ...@@ -334,11 +336,11 @@ Summary: Development header files and libraries for MySQL as an embeddabl
Group: Applications/Databases Group: Applications/Databases
%if 0%{?commercial} %if 0%{?commercial}
Obsoletes: mysql-community-embedded-devel < %{version}-%{release} Obsoletes: mysql-community-embedded-devel < %{version}-%{release}
Requires: mysql-commercial-devel = %{version}-%{release} Requires: mysql-commercial-devel >= %{min}
Requires: mysql-commercial-embedded = %{version}-%{release} Requires: mysql-commercial-embedded >= %{min}
%else %else
Requires: mysql-community-devel = %{version}-%{release} Requires: mysql-community-devel >= %{min}
Requires: mysql-community-embedded = %{version}-%{release} Requires: mysql-community-embedded >= %{min}
%endif %endif
Obsoletes: mariadb-embedded-devel Obsoletes: mariadb-embedded-devel
Obsoletes: mysql-embedded-devel < %{version}-%{release} Obsoletes: mysql-embedded-devel < %{version}-%{release}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7