Fix package names, by removing a trailing "-MariaDB" ,as we already have leading "mariadb-".

Hardcode -MariaDB suffix for MYSQL_SERVER_VERSION in mysql_version.h

VERSION

 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
 MYSQL_VERSION_PATCH=18
-MYSQL_VERSION_EXTRA=-MariaDB
+MYSQL_VERSION_EXTRA=

include/mysql_version.h.in

@@ -9,7 +9,7 @@
 #include <custom_conf.h>
 #else
 #define PROTOCOL_VERSION		@PROTOCOL_VERSION@
-#define MYSQL_SERVER_VERSION		"@VERSION@"
+#define MYSQL_SERVER_VERSION		"@VERSION@-MariaDB"
 #define MYSQL_BASE_VERSION		"mysqld-@MYSQL_BASE_VERSION@"
 #define MARIADB_BASE_VERSION		"mariadb-@MYSQL_BASE_VERSION@"
 #define MYSQL_SERVER_SUFFIX_DEF		"@MYSQL_SERVER_SUFFIX@"