From ce3c0ade5fa2d8d87d7530cf8500819d90030d10 Mon Sep 17 00:00:00 2001 From: Balasubramanian Kandasamy Date: Thu, 6 Mar 2014 11:23:15 +0100 Subject: Bug#18327194 - Resolve confict issues during upgrade --- packaging/rpm-oel/mysql.spec.in | 52 +++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index 47e0b35bb15..ef06563c04a 100644 --- a/packaging/rpm-oel/mysql.spec.in +++ b/packaging/rpm-oel/mysql.spec.in @@ -81,12 +81,11 @@ %global license_type GPLv2 %endif - Name: mysql-%{product_suffix} Summary: A very fast and reliable SQL database server Group: Applications/Databases Version: @VERSION@ -Release: 1%{?dist} +Release: 2%{?dist} License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field. Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz URL: http://www.mysql.com/ @@ -205,10 +204,12 @@ Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release} %else Requires: mysql-community-libs%{?_isa} = %{version}-%{release} %endif -Obsoletes: mysql < %{version}-%{release} Obsoletes: mariadb +%if 0%{?rhel} > 5 +Obsoletes: mysql < %{version}-%{release} Provides: mysql = %{version}-%{release} Provides: mysql%{?_isa} = %{version}-%{release} +%endif %description client This package contains the standard MySQL clients and administration @@ -288,9 +289,15 @@ applications. %package libs-compat Summary: Shared compat libraries for MySQL %{compatver} database client applications Group: Applications/Databases -Obsoletes: mysql-libs-compat < %{version}-%{release} -Provides: mysql-libs-compat = %{version}-%{release} -Provides: mysql-libs-compat%{?_isa} = %{version}-%{release} +%if 0%{?commercial} +Obsoletes: mysql-community-libs-compat < %{version}-%{release} +Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release} +%else +Requires: mysql-community-libs%{?_isa} = %{version}-%{release} +%endif +%if 0%{?rhel} > 5 +Obsoletes: mysql-libs < %{version}-%{release} +%endif %description libs-compat This package contains the shared compat libraries for MySQL %{compatver} client @@ -338,9 +345,31 @@ Provides: mysql-embedded-devel = %{version}-%{release} Provides: mysql-embedded-devel%{?_isa} = %{version}-%{release} %description embedded-devel -This package contains files needed for developing applicatison using +This package contains files needed for developing applications using the embedded version of the MySQL server. +%if 0%{?rhel} == 5 +%package -n mysql +Summary: Convenience package for easy upgrades of MySQL package set +Group: Applications/Databases +%if 0%{?commercial} +Requires: mysql-enterprise-client%{?_isa} = %{version}-%{release} +Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release} +Requires: mysql-enterprise-libs-compat%{?_isa} = %{version}-%{release} +%else +Requires: mysql-community-client%{?_isa} = %{version}-%{release} +Requires: mysql-community-libs%{?_isa} = %{version}-%{release} +Requires: mysql-community-libs-compat%{?_isa} = %{version}-%{release} +%endif + +%description -n mysql +This package has as sole purpose to require other MySQL packages such +that upgrades will be more convenient. + +Technical background: this is done to reflect the fact that mysql +package has been split into several subpackages. +%endif + %prep %if 0%{?compatlib} %setup -q -T -a 0 -a 7 -c -n %{src_dir} @@ -779,7 +808,16 @@ fi %attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a %attr(755, root, root) %{_libdir}/mysql/libmysqld.so +%if 0%{?rhel} == 5 +%files -n mysql +%defattr(-, root, root, -) +%doc %{?license_files_server} +%endif + %changelog +* Thu Mar 06 2014 Balasubramanian Kandasamy - 5.5.37-2 +- Resolve confict issues during upgrade + * Mon Feb 10 2014 Balasubramanian Kandasamy - 5.5.37-1 - Add support for el7 (with systemd enabled) - Enable shared libmysqld by cmake option -- cgit v1.2.1 From 22bec1c2db3148770c16b369d453c1933aec7894 Mon Sep 17 00:00:00 2001 From: Balasubramanian Kandasamy Date: Thu, 6 Mar 2014 12:45:07 +0100 Subject: Corrected typo in changelog --- packaging/rpm-oel/mysql.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index ef06563c04a..232f70fe809 100644 --- a/packaging/rpm-oel/mysql.spec.in +++ b/packaging/rpm-oel/mysql.spec.in @@ -816,7 +816,7 @@ fi %changelog * Thu Mar 06 2014 Balasubramanian Kandasamy - 5.5.37-2 -- Resolve confict issues during upgrade +- Resolve conflict issues during upgrade * Mon Feb 10 2014 Balasubramanian Kandasamy - 5.5.37-1 - Add support for el7 (with systemd enabled) -- cgit v1.2.1 From 47c3f23c067d4f2558b199cca6eb882f4196e911 Mon Sep 17 00:00:00 2001 From: Balasubramanian Kandasamy Date: Wed, 12 Mar 2014 14:30:20 +0100 Subject: Bug#18389088 - Resolve conflict with mysql-libs-compat --- packaging/rpm-oel/mysql.spec.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index 232f70fe809..923027e92c8 100644 --- a/packaging/rpm-oel/mysql.spec.in +++ b/packaging/rpm-oel/mysql.spec.in @@ -85,7 +85,7 @@ Name: mysql-%{product_suffix} Summary: A very fast and reliable SQL database server Group: Applications/Databases Version: @VERSION@ -Release: 2%{?dist} +Release: 3%{?dist} License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field. Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz URL: http://www.mysql.com/ @@ -289,6 +289,9 @@ applications. %package libs-compat Summary: Shared compat libraries for MySQL %{compatver} database client applications Group: Applications/Databases +Obsoletes: mysql-libs-compat < %{version}-%{release} +Provides: mysql-libs-compat = %{version}-%{release} +Provides: mysql-libs-compat%{?_isa} = %{version}-%{release} %if 0%{?commercial} Obsoletes: mysql-community-libs-compat < %{version}-%{release} Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release} @@ -815,6 +818,9 @@ fi %endif %changelog +* Wed Mar 12 2014 Balasubramanian Kandasamy - 5.5.37-3 +- Resolve conflict with mysql-libs-compat + * Thu Mar 06 2014 Balasubramanian Kandasamy - 5.5.37-2 - Resolve conflict issues during upgrade -- cgit v1.2.1 From faec0e2f4aecfc902e354ae7af991779d6bfc4a7 Mon Sep 17 00:00:00 2001 From: Balasubramanian Kandasamy Date: Fri, 14 Mar 2014 19:46:27 +0100 Subject: Bug#18402229 - Resolve mysql conflict with mysql-community-client --- packaging/rpm-oel/mysql.spec.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index 923027e92c8..d9e29317ff5 100644 --- a/packaging/rpm-oel/mysql.spec.in +++ b/packaging/rpm-oel/mysql.spec.in @@ -85,7 +85,7 @@ Name: mysql-%{product_suffix} Summary: A very fast and reliable SQL database server Group: Applications/Databases Version: @VERSION@ -Release: 3%{?dist} +Release: 4%{?dist} License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field. Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz URL: http://www.mysql.com/ @@ -223,6 +223,7 @@ Obsoletes: mysql-community-common < %{version}-%{release} %endif Provides: mysql-common = %{version}-%{release} Provides: mysql-common%{?_isa} = %{version}-%{release} +%{?el5:Requires: mysql%{?_isa} = %{version}-%{release}} %description common This packages contains common files needed by MySQL client library, @@ -818,6 +819,9 @@ fi %endif %changelog +* Fri Mar 14 2014 Balasubramanian Kandasamy - 5.5.37-4 +- Resolve mysql conflict with mysql-community-client + * Wed Mar 12 2014 Balasubramanian Kandasamy - 5.5.37-3 - Resolve conflict with mysql-libs-compat -- cgit v1.2.1