Skip to content

Commit cc11b9d

Browse files
committed
Bug#25749218 - PACKAGE(MYSQL-CLUSTER-COMMUNITY-TEST-7.6.1-1.EL7.X86_64.RPM )MISSING DEPENDENCY
Fixed cluster test packages dependencies, cluster test packages requires both data-node and managment-server packages
1 parent 0f8a275 commit cc11b9d

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

packaging/deb-in/control.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ Package: mysql-@DEB_PRODUCTNAME@-test
175175
Architecture: any
176176
Depends: mysql-@DEB_PRODUCTNAME@-server (= ${binary:Version}),
177177
mysql-@DEB_PRODUCTNAME@-client (= ${binary:Version}), python,
178-
libmysqlclient-dev, ${shlibs:Depends}, ${misc:Depends}
178+
libmysqlclient-dev, ${shlibs:Depends}, ${misc:Depends},
179+
@DEB_NDB_CONTROL_TEST_DEPS@
179180
Breaks: mysql-@DEB_PRODUCTNAME@-server (<< 5.7.14),
180181
mysql-@DEB_PRODUCTNAME@-client (<< 5.7.14)
181182
Conflicts: mysql,

packaging/deb-in/deb_ndb.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# along with this program; if not, write to the Free Software
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

16+
SET (DEB_NDB_CONTROL_TEST_DEPS "mysql-${DEB_PRODUCTNAME}-data-node (= \${binary:Version}), mysql-${DEB_PRODUCTNAME}-management-server (= \${binary:Version})")
1617

1718
SET(DEB_NDB_CONTROL_EXTRAS
1819
"

packaging/rpm-oel/mysql.spec.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,10 @@ MySQL database server, and MySQL embedded server.
288288
Summary: Test suite for the MySQL database server
289289
Group: Applications/Databases
290290
Requires: %{name}-server%{?_isa} >= %{min}
291+
%if 0%{?cluster}
292+
Requires: %{name}-data-node%{?_isa} >= %{min}
293+
Requires: %{name}-management-server%{?_isa} >= %{min}
294+
%endif
291295
%if 0%{?commercial}
292296
Provides: MySQL-test-advanced%{?_isa} = %{version}-%{release}
293297
Obsoletes: MySQL-test-advanced < %{version}-%{release}

packaging/rpm-sles/mysql.spec.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,10 @@ MySQL database server, and MySQL embedded server.
250250
Summary: Test suite for the MySQL database server
251251
Group: Applications/Databases
252252
Requires: %{name}-server >= %{min}
253+
%if 0%{?cluster}
254+
Requires: %{name}-data-node%{?_isa} >= %{min}
255+
Requires: %{name}-management-server%{?_isa} >= %{min}
256+
%endif
253257
%if 0%{?commercial}
254258
Provides: MySQL-test-advanced = %{version}-%{release}
255259
Obsoletes: MySQL-test-advanced < %{version}-%{release}

0 commit comments

Comments
 (0)