Skip to content

Commit 53c2975

Browse files
committed
Build Server and Cluster dmr from the same branch
- Fix the rpm package names for cluster dmr release (cherry picked from commit 4afabdf5fb3a98bfc18247fc2809275d4d2e398d)
1 parent 650af4c commit 53c2975

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

packaging/rpm-docker/mysql.spec.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ Name: mysql%{?cluster:-cluster}-%{product_suffix}-minimal
5050
Summary: A very fast and reliable SQL database server
5151
Group: Applications/Databases
5252
Version: @MYSQL_NO_DASH_VERSION@
53+
%if 0%{?cluster}
54+
Release: 0.1@MYSQL_VERSION_EXTRA_DOT@%{?commercial:.1}%{?dist}
55+
%else
5356
Release: 1@MYSQL_VERSION_EXTRA_DOT@%{?commercial:.1}%{?dist}
57+
%endif
5458
License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
5559
URL: http://www.mysql.com/
5660
Packager: MySQL Release Engineering <[email protected]>

packaging/rpm-oel/mysql.spec.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,11 @@ Name: mysql%{?cluster:-cluster}-%{product_suffix}
9090
Summary: A very fast and reliable SQL database server
9191
Group: Applications/Databases
9292
Version: @MYSQL_NO_DASH_VERSION@
93+
%if 0%{?cluster}
94+
Release: 0.1@MYSQL_VERSION_EXTRA_DOT@%{?commercial:.1}%{?dist}
95+
%else
9396
Release: 1@MYSQL_VERSION_EXTRA_DOT@%{?commercial:.1}%{?dist}
97+
%endif
9498
License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
9599
Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
96100
URL: http://www.mysql.com/

packaging/rpm-sles/mysql.spec.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,11 @@ Name: mysql%{?cluster:-cluster}-%{product_suffix}
9494
Summary: A very fast and reliable SQL database server
9595
Group: Applications/Databases
9696
Version: @MYSQL_NO_DASH_VERSION@
97+
%if 0%{?cluster}
98+
Release: 0.1@MYSQL_VERSION_EXTRA_DOT@%{?commercial:.1}%{?dist}
99+
%else
97100
Release: 1@MYSQL_VERSION_EXTRA_DOT@%{?commercial:.1}%{?dist}
101+
%endif
98102
License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
99103
Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
100104
URL: http://www.mysql.com/

0 commit comments

Comments
 (0)