MDEV-9869 INSTALL SONAME 'ha_connect'

fix 011497bd603

in RPM and DEB: storage engine packages must require the server
package of exactly correct version.

4 files changed, 24 insertions, 11 deletions

diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 2a2f206dcef..70b252c16b5 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -230,7 +230,7 @@ MACRO(MYSQL_ADD_PLUGIN)
         SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} PARENT_SCOPE)
 
         IF (NOT ARG_CLIENT)
-          SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB${ver}" PARENT_SCOPE)
+          SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB-server${ver}" PARENT_SCOPE)
         ENDIF()
         # workarounds for cmake issues #13248 and #12864:
         SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_PROVIDES "cmake_bug_13248" PARENT_SCOPE)
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 92c68c225d7..688698dad8a 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -79,7 +79,7 @@ GCCVERSION=$(gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]
 # x86 32 bit.
 if [[ $GCCVERSION -lt 40800 ]] || [[ $(arch) =~ i[346]86 ]]
 then
-  sed '/Package: mariadb-plugin-rocksdb/,+7d' -i debian/control
+  sed '/Package: mariadb-plugin-rocksdb/,+9d' -i debian/control
 fi
 if [[ $GCCVERSION -lt 40800 ]]
 then
diff --git a/debian/control b/debian/control
index d75d7c40749..79936870579 100644
--- a/debian/control
+++ b/debian/control
@@ -438,7 +438,7 @@ Description: MariaDB database client (metapackage depending on the latest versio
 Package: mariadb-plugin-connect
 Architecture: any
 Depends: libxml2,
-         mariadb-server-10.2,
+         mariadb-server-10.2 (= ${binary:Version}),
          unixodbc,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -452,7 +452,9 @@ Description: Connect storage engine for MariaDB
 
 Package: mariadb-plugin-rocksdb
 Architecture: any
-Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Depends: mariadb-server-10.2 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: RocksDB storage engine for MariaDB
  The RocksDB storage engine is a high performance storage engine, aimed
  at maximising storage efficiency while maintaining InnoDB-like performance.
@@ -460,7 +462,10 @@ Description: RocksDB storage engine for MariaDB
 
 Package: mariadb-plugin-oqgraph
 Architecture: any
-Depends: libjudydebian1, mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Depends: libjudydebian1,
+         mariadb-server-10.2 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: mariadb-oqgraph-engine-10.1, mariadb-oqgraph-engine-10.2
 Replaces: mariadb-oqgraph-engine-10.1, mariadb-oqgraph-engine-10.2
 Description: OQGraph storage engine for MariaDB
@@ -470,7 +475,9 @@ Description: OQGraph storage engine for MariaDB
 
 Package: mariadb-plugin-tokudb
 Architecture: any
-Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Depends: mariadb-server-10.2 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
         mariadb-server-10.1,
         mariadb-server-10.2 (<< ${source:Version})
@@ -485,7 +492,9 @@ Description: TokuDB storage engine for MariaDB
 
 Package: mariadb-plugin-mroonga
 Architecture: any
-Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Depends: mariadb-server-10.2 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
         mariadb-server-10.1,
         mariadb-server-10.2 (<< ${source:Version})
@@ -499,7 +508,9 @@ Description: Mroonga storage engine for MariaDB
 
 Package: mariadb-plugin-spider
 Architecture: any
-Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Depends: mariadb-server-10.2 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
         mariadb-server-10.1,
         mariadb-server-10.2 (<< ${source:Version})
@@ -514,7 +525,9 @@ Description: Spider storage engine for MariaDB
 
 Package: mariadb-plugin-cassandra
 Architecture: any
-Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Depends: mariadb-server-10.2 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
         mariadb-server-10.1,
         mariadb-server-10.2 (<< ${source:Version})
diff --git a/debian/rules b/debian/rules
index 2041371a409..16bcf2a0073 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,13 +116,13 @@ override_dh_auto_install:
 
 # Skip TokuDB if arch is not amd64
 ifneq ($(ARCH), amd64)
-	sed -i -e "/Package: mariadb-plugin-tokudb/,+14d" debian/control
+	sed -i -e "/Package: mariadb-plugin-tokudb/,+16d" debian/control
 endif
 
 	# If libthrift-dev was available (manually installed, as it is
 	# not in Debian) and ha_cassandra.so was thus built, create package,
 	# otherwise skip it.
-	[ -f $(BUILDDIR)/storage/cassandra/ha_cassandra.so ] || sed -i -e "/Package: mariadb-plugin-cassandra/,+16d" debian/control
+	[ -f $(BUILDDIR)/storage/cassandra/ha_cassandra.so ] || sed -i -e "/Package: mariadb-plugin-cassandra/,+18d" debian/control
 
 	# Copy systemd files to a location available for dh_installinit
 	cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.2.mariadb.service