MDEV-31231 fixes for MariaDB-connect-engine* rpms

* don't introduce random four-space-gaps into the middle of description
  (meaning, nicely aligned wrapped string in the code gets ugly
  in the rpm)
* remove obsolete comment
* MariaDB-connect-engine is a required package for MariaDB-connect-engine-jdbc
  not "recommended"
* don't recommend both mariadb-java-client and mysql-connector-java
* in fact, don't recommend anything, it works badly for old rpm < 4.13,
  installs something that user may not want, and install redundand deps.
  Let's rethink how to do it meaningfully. And not break tests.

followup for 7ba9c7fb

storage/connect/CMakeLists.txt

@@ -19,8 +19,8 @@ ENDIF()
 
 SET(CPACK_RPM_connect-engine_PACKAGE_SUMMARY "Connect storage engine for MariaDB Server" PARENT_SCOPE)
 SET(CPACK_RPM_connect-engine_PACKAGE_DESCRIPTION "Connect engine supports a number of file formats (dbf, xml, txt, bin, etc),
-    connections to ODBC tables and remote MySQL tables, as well as a number of
-    other interesting features." PARENT_SCOPE)
+connections to ODBC tables and remote MySQL tables, as well as a number of
+other interesting features." PARENT_SCOPE)
 
 SET(CONNECT_PLUGIN_STATIC  "connect")
 SET(CONNECT_PLUGIN_DYNAMIC "connect")
@@ -442,23 +442,20 @@ ENDIF()
 
 
 IF(CONNECT_WITH_JDBC AND JAVA_FOUND AND JNI_FOUND)
-  # TODO: Find how to compile and install the java wrapper classes
-  # Find required libraries and include directories
   SET (JAVA_SOURCES JdbcInterface.java)
   add_jar(JdbcInterface ${JAVA_SOURCES} OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/connect_jars)
   get_target_property(_jarFile JdbcInterface JAR_FILE)
   INSTALL(FILES
     ${_jarFile} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT connect-engine-jdbc)
   SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} connect-engine-jdbc PARENT_SCOPE)
-  SET(CPACK_RPM_connect-engine-jdbc_PACKAGE_RECOMMENDS "MariaDB-connect-engine, mariadb-java-client, postgresql-jdbc, mysql-connector-java" PARENT_SCOPE)
+  SET(CPACK_RPM_connect-engine-jdbc_PACKAGE_REQUIRES "jre-headless >= 1.8 MariaDB-connect-engine" PARENT_SCOPE)
+  #how to make it meaningful? SUGGESTS? (mariadb-java-client or mysql-connector-java) ?
+  #SET(CPACK_RPM_connect-engine-jdbc_PACKAGE_RECOMMENDS "mariadb-java-client postgresql-jdbc mysql-connector-java" PARENT_SCOPE)
   SET(CPACK_RPM_connect-engine-jdbc_PACKAGE_SUMMARY "Connect storage engine JDBC interface" PARENT_SCOPE)
   SET(CPACK_RPM_connect-engine-jdbc_PACKAGE_DESCRIPTION "Connect storage engine JDBC interface
-      used to interact with external DBMS via Java connector" PARENT_SCOPE)
-  IF (RPM)
-    # Add file to populate CPACK_RPM_BUILDREQUIRES
-    FIND_FILE(Libjni_h jni.h PATHS ${JAVA_INCLUDE_PATH})
-    SET(CPACK_RPM_connect-engine-jdbc_PACKAGE_REQUIRES "jre-headless >= 1.8" PARENT_SCOPE)
-  ENDIF()
+used to interact with external DBMS via Java connector" PARENT_SCOPE)
+  # Add file to populate CPACK_RPM_BUILDREQUIRES
+  FIND_FILE(Libjni_h jni.h PATHS ${JAVA_INCLUDE_PATH})
   IF(CONNECT_WITH_MONGO)
     INSTALL(FILES
       ${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/connect/std_data/Mongo2.jar