diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-12-09 10:35:16 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-12-09 10:35:16 -0500 |
| commit | 41367e4023d0823624a461597813e6902437f096 (patch) | |
| tree | 27312418248fa710ab8cc199d05aded037f0150e | |
| parent | e51e5e940c5c0b2cfd1a9bc07833a933a0460c4e (diff) | |
| download | mariadb-git-41367e4023d0823624a461597813e6902437f096.tar.gz | |
MDEV-7204: mariadb-galera-server el7 rpms packaging
issue, no mariadb-server in provides
MDEV-7233: Fix issue with missing dependency socat
when installing MariaDB-galera-server on
RedhatEL/OracleEL/(Others?) RPM based
* Added mariadb-server to "provides" for MariaDB Galera
server package. (rpm)
* Removed "socat" from MariaDB Galera server's mandatory
dependency list. (rpm)
* Moved "socat" from mandatory to optional dependency. (deb)
| -rw-r--r-- | cmake/cpack_rpm.cmake | 4 | ||||
| -rw-r--r-- | debian/dist/Debian/control | 4 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/control | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 8c442375116..8b7a414fd69 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -121,12 +121,14 @@ SETA(CPACK_RPM_server_PACKAGE_OBSOLETES SETA(CPACK_RPM_server_PACKAGE_PROVIDES "MariaDB" "MySQL" + "MariaDB-server" + "mariadb-server" "MySQL-server" "msqlormysql" "mysql-server") SETA(CPACK_RPM_server_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}" - "MariaDB-client" "galera" "rsync" "lsof" "socat" "grep" "gawk" "iproute" + "MariaDB-client" "galera" "rsync" "lsof" "grep" "gawk" "iproute" "coreutils" "findutils") SETA(CPACK_RPM_shared_PACKAGE_OBSOLETES diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index 22eaa09c52e..0d2ee662679 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -38,14 +38,14 @@ Description: MariaDB database regression test suite Package: mariadb-galera-server-10.0 Architecture: any -Suggests: tinyca, mailx, mariadb-galera-test, netcat-openbsd +Suggests: tinyca, mailx, mariadb-galera-test, netcat-openbsd, socat Recommends: libhtml-template-perl Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), bsdutils, libmariadbclient18 (>= ${binary:Version}), galera (>=25.2), - rsync, lsof, socat, grep, gawk, iproute, coreutils, findutils + rsync, lsof, grep, gawk, iproute, coreutils, findutils Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5, mysql-server-core-10.0, mariadb-server, mysql-server, virtual-mysql-server, mariadb-galera-server diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index 7a6aae756a2..a6d4cbbc482 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -38,14 +38,14 @@ Description: MariaDB database regression test suite Package: mariadb-galera-server-10.0 Architecture: any -Suggests: tinyca, mailx, mariadb-galera-test, netcat-openbsd +Suggests: tinyca, mailx, mariadb-galera-test, netcat-openbsd, socat Recommends: libhtml-template-perl Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), bsdutils, libmariadbclient18 (>= ${binary:Version}), galera (>=25.2), - rsync, lsof, socat, grep, gawk, iproute, coreutils, findutils + rsync, lsof, grep, gawk, iproute, coreutils, findutils Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5, mysql-server-core-10.0, mariadb-server, mysql-server, virtual-mysql-server, mariadb-galera-server |