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)

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

debian/dist/Debian/control

@@ -36,14 +36,14 @@ Description: MariaDB database regression test suite
 
 Package: mariadb-galera-server-5.5
 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-5.5 (>= ${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, virtual-mysql-server, mariadb-galera-server
 Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,

debian/dist/Ubuntu/control

@@ -36,14 +36,14 @@ Description: MariaDB database regression test suite
 
 Package: mariadb-galera-server-5.5
 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-5.5 (>= ${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, virtual-mysql-server, mariadb-galera-server
 Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,