From 6af9ed3656113020e3c83bb06358ac3f32eff5c2 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Wed, 31 Jan 2024 19:48:36 +0100 Subject: [PATCH] Apply demodularization --- .gitignore | 0 mariadb.spec => mariadb10.11.spec | 306 +++++++++++++++++++----------- sources | 0 3 files changed, 193 insertions(+), 113 deletions(-) mode change 100644 => 100755 .gitignore rename mariadb.spec => mariadb10.11.spec (93%) mode change 100644 => 100755 sources diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/mariadb.spec b/mariadb10.11.spec similarity index 93% rename from mariadb.spec rename to mariadb10.11.spec index 6f415dc..5e1a943 100644 --- a/mariadb.spec +++ b/mariadb10.11.spec @@ -1,8 +1,13 @@ # Plain package name for cases, where %{name} differs (e.g. for versioned packages) %global pkg_name mariadb +%define package_version 10.11.6 +%define pkg_version %(echo %{package_version} | cut -d'.' -f1-2 ) + +# Set if this package will be the default one in distribution +%{!?mariadb_default:%global mariadb_default 1} # Regression tests may take a long time (many cores recommended), skip them by -%{!?runselftest:%global runselftest 1} +%{!?runselftest:%global runselftest 0} # Set this to 1 to see which tests fail, but 0 on production ready build %global ignore_testsuite_result 0 @@ -129,9 +134,9 @@ # Make long macros shorter %global sameevr %{epoch}:%{version}-%{release} -Name: mariadb -Version: 10.11.6 -Release: 1%{?with_debug:.debug}%{?dist} +Name: %{pkg_name}%{pkg_version} +Version: %{package_version} +Release: 2%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A very fast and robust SQL database server @@ -187,6 +192,15 @@ Patch9: %{pkg_name}-ownsetup.patch Patch10: %{pkg_name}-ssl-cipher-tests.patch Patch12: rocksdb-6.8-gcc13.patch +# This macro is used for package/sub-package names in the entire specfile +%if %?mariadb_default +%global pkgname %{pkg_name} +%package -n %{pkgname} +Summary: A very fast and robust SQL database server +%else +%global pkgname %{name} +%endif + BuildRequires: make cmake gcc-c++ BuildRequires: multilib-rpm-config BuildRequires: selinux-policy-devel @@ -260,17 +274,17 @@ BuildRequires: fmt-devel Requires: bash coreutils grep -Requires: %{name}-common = %{sameevr} +Requires: %{pkgname}-common = %{sameevr} %if %{with clibrary} # Explicit EVR requirement for -libs is needed for RHBZ#1406320 -Requires: %{name}-libs%{?_isa} = %{sameevr} +Requires: %{pkgname}-libs%{?_isa} = %{sameevr} %else # If not built with client library in this package, use connector-c Requires: mariadb-connector-c >= 3.0 %endif -Suggests: %{name}-server%{?_isa} = %{sameevr} +Suggests: %{pkgname}-server%{?_isa} = %{sameevr} %{?with_conflicts_mysql:Conflicts: mysql} %{?with_conflicts_community_mysql:Conflicts: community-mysql} @@ -278,6 +292,23 @@ Suggests: %{name}-server%{?_isa} = %{sameevr} %{?with_conflicts_mysql:Conflicts: mysql-server} %{?with_conflicts_community_mysql:Conflicts: community-mysql-server} +%define conflict_with_other_streams() %{expand:\ +Provides: %{pkg_name}%{?1:-%{1}}-any\ +Conflicts: %{pkg_name}%{?1:-%{1}}-any\ +} + +%define pkg_provides() %{expand:\ +Provides: %{pkgname}%{?1:-%{1}} = %{sameevr}\ +Provides: %{pkgname}%{?1:-%{1}}%{?_isa} = %{sameevr}\ +} + +%define add_metadata() %{expand:\ +%conflict_with_other_streams %{**}\ +%pkg_provides %{**}\ +} + +%add_metadata + %description MariaDB is a community developed fork from MySQL - a multi-user, multi-threaded SQL database server. It is a client/server implementation consisting of @@ -285,16 +316,24 @@ a server daemon (mariadbd) and many different client programs and libraries. The base package contains the standard MariaDB/MySQL client programs and utilities. +%description -n %{pkgname} +MariaDB is a community developed fork from MySQL - a multi-user, multi-threaded +SQL database server. It is a client/server implementation consisting of +a server daemon (mariadbd) and many different client programs and libraries. +The base package contains the standard MariaDB/MySQL client programs and +utilities. %if %{with clibrary} -%package libs +%package -n %{pkgname}-libs Summary: The shared libraries required for MariaDB/MySQL clients -Requires: %{name}-common = %{sameevr} +Requires: %{pkgname}-common = %{sameevr} + +%add_metadata libs %{?with_conflicts_mysql:Conflicts: mysql-libs} %{?with_conflicts_community_mysql:Conflicts: community-mysql-libs} -%description libs +%description -n %{pkgname}-libs The mariadb-libs package provides the essential shared libraries for any MariaDB/MySQL client program or interface. You will need to install this package to use any other MariaDB package or any clients that need to connect @@ -312,10 +351,12 @@ to a MariaDB/MySQL server. # a specific package, so installer app can choose whatever package fits to # the transaction. %if %{with config} -%package config +%package -n %{pkgname}-config Summary: The config files required by server and client -%description config +%add_metadata config + +%description -n %{pkgname}-config The package provides the config file my.cnf and my.cnf.d directory used by any MariaDB or MySQL program. You will need to install this package to use any other MariaDB or MySQL package if the config files are not provided in the @@ -324,29 +365,32 @@ package itself. %if %{with common} -%package common +%package -n %{pkgname}-common Summary: The shared files required by server and client BuildArch: noarch Requires: %{_sysconfdir}/my.cnf +%add_metadata common %if %{without clibrary} -Obsoletes: %{name}-libs <= %{sameevr} +Obsoletes: %{pkgname}-libs <= %{sameevr} %endif -%description common +%description -n %{pkgname}-common The package provides the essential shared files for any MariaDB program. You will need to install this package to use any other MariaDB package. %endif %if %{with errmsg} -%package errmsg +%package -n %{pkgname}-errmsg Summary: The error messages files required by server and embedded BuildArch: noarch -Requires: %{name}-common = %{sameevr} +Requires: %{pkgname}-common = %{sameevr} -%description errmsg +%add_metadata errmsg + +%description -n %{pkgname}-errmsg The package provides error messages files for the MariaDB daemon and the embedded server. You will need to install this package to use any of those MariaDB packages. @@ -354,10 +398,10 @@ MariaDB packages. %if %{with galera} -%package server-galera +%package -n %{pkgname}-server-galera Summary: The configuration files and scripts for galera replication -Requires: %{name}-common = %{sameevr} -Requires: %{name}-server%{?_isa} = %{sameevr} +Requires: %{pkgname}-common = %{sameevr} +Requires: %{pkgname}-server%{?_isa} = %{sameevr} Requires: galera >= 26.4.3 BuildRequires: selinux-policy-devel Requires(post): (libselinux-utils if selinux-policy-targeted) @@ -368,7 +412,9 @@ Requires: lsof # Default wsrep_sst_method Requires: rsync -%description server-galera +%add_metadata server-galera + +%description -n %{pkgname}-server-galera MariaDB is a multi-user, multi-threaded SQL database server. It is a client/server implementation consisting of a server daemon (mariadbd) and many different client programs and libraries. This package contains @@ -377,21 +423,21 @@ member. MariaDB is a community developed fork originally from MySQL. %endif -%package server +%package -n %{pkgname}-server Summary: The MariaDB server and related files -Requires: %{name}%{?_isa} -Requires: %{name}-common = %{sameevr} -Requires: %{name}-errmsg = %{sameevr} -Recommends: %{name}-server-utils%{?_isa} = %{sameevr} -Recommends: %{name}-backup%{?_isa} = %{sameevr} -%{?with_cracklib:Recommends: %{name}-cracklib-password-check%{?_isa} = %{sameevr}} -%{?with_gssapi:Recommends: %{name}-gssapi-server%{?_isa} = %{sameevr}} -%{?with_rocksdb:Suggests: %{name}-rocksdb-engine%{?_isa} = %{sameevr}} -%{?with_sphinx:Suggests: %{name}-sphinx-engine%{?_isa} = %{sameevr}} -%{?with_oqgraph:Suggests: %{name}-oqgraph-engine%{?_isa} = %{sameevr}} -%{?with_connect:Suggests: %{name}-connect-engine%{?_isa} = %{sameevr}} -%{?with_pam:Suggests: %{name}-pam%{?_isa} = %{sameevr}} +Requires: %{pkgname}%{?_isa} +Requires: %{pkgname}-common = %{sameevr} +Requires: %{pkgname}-errmsg = %{sameevr} +Recommends: %{pkgname}-server-utils%{?_isa} = %{sameevr} +Recommends: %{pkgname}-backup%{?_isa} = %{sameevr} +%{?with_cracklib:Recommends: %{pkgname}-cracklib-password-check%{?_isa} = %{sameevr}} +%{?with_gssapi:Recommends: %{pkgname}-gssapi-server%{?_isa} = %{sameevr}} +%{?with_rocksdb:Suggests: %{pkgname}-rocksdb-engine%{?_isa} = %{sameevr}} +%{?with_sphinx:Suggests: %{pkgname}-sphinx-engine%{?_isa} = %{sameevr}} +%{?with_oqgraph:Suggests: %{pkgname}-oqgraph-engine%{?_isa} = %{sameevr}} +%{?with_connect:Suggests: %{pkgname}-connect-engine%{?_isa} = %{sameevr}} +%{?with_pam:Suggests: %{pkgname}-pam%{?_isa} = %{sameevr}} Suggests: mytop Suggests: logrotate @@ -399,6 +445,8 @@ Suggests: logrotate Requires: %{_sysconfdir}/my.cnf Requires: %{_sysconfdir}/my.cnf.d +%add_metadata server + # Additional SELinux rules (common for MariaDB & MySQL) shipped in a separate package # For cases, where we want to fix a SELinux issues in MariaDB sooner than patched selinux-policy-targeted package is released %if %{with require_mysql_selinux} @@ -423,7 +471,7 @@ Requires: iproute %{?with_conflicts_mysql:Conflicts: mysql} %{?with_conflicts_community_mysql:Conflicts: community-mysql} -%description server +%description -n %{pkgname}-server MariaDB is a multi-user, multi-threaded SQL database server. It is a client/server implementation consisting of a server daemon (mariadbd) and many different client programs and libraries. This package contains @@ -432,13 +480,15 @@ MariaDB is a community developed fork from MySQL. %if %{with oqgraph} -%package oqgraph-engine +%package -n %{pkgname}-oqgraph-engine Summary: The Open Query GRAPH engine for MariaDB -Requires: %{name}-server%{?_isa} = %{sameevr} +Requires: %{pkgname}-server%{?_isa} = %{sameevr} # boost and Judy required for oograph BuildRequires: boost-devel Judy-devel -%description oqgraph-engine +%add_metadata oqgraph-engine + +%description -n %{pkgname}-oqgraph-engine The package provides Open Query GRAPH engine (OQGRAPH) as plugin for MariaDB database server. OQGRAPH is a computation engine allowing hierarchies and more complex graph structures to be handled in a relational fashion. In a nutshell, @@ -448,14 +498,16 @@ standard SQL syntax, and results joined onto other tables. %if %{with connect} -%package connect-engine +%package -n %{pkgname}-connect-engine Summary: The CONNECT storage engine for MariaDB -Requires: %{name}-server%{?_isa} = %{sameevr} +Requires: %{pkgname}-server%{?_isa} = %{sameevr} # As per https://jira.mariadb.org/browse/MDEV-21450 BuildRequires: libxml2-devel -%description connect-engine +%add_metadata connect-engine + +%description -n %{pkgname}-connect-engine The CONNECT storage engine enables MariaDB to access external local or remote data (MED). This is done by defining tables based on different data types, in particular files in various formats, data extracted from other DBMS @@ -465,12 +517,14 @@ or products (such as Excel), or data retrieved from the environment %if %{with backup} -%package backup +%package -n %{pkgname}-backup Summary: The mariabackup tool for physical online backups -Requires: %{name}-server%{?_isa} = %{sameevr} +Requires: %{pkgname}-server%{?_isa} = %{sameevr} BuildRequires: libarchive-devel -%description backup +%add_metadata backup + +%description -n %{pkgname}-backup MariaDB Backup is an open source tool provided by MariaDB for performing physical online backups of InnoDB, Aria and MyISAM tables. For InnoDB, "hot online" backups are possible. @@ -478,20 +532,22 @@ For InnoDB, "hot online" backups are possible. %if %{with rocksdb} -%package rocksdb-engine +%package -n %{pkgname}-rocksdb-engine Summary: The RocksDB storage engine for MariaDB -Requires: %{name}-server%{?_isa} = %{sameevr} +Requires: %{pkgname}-server%{?_isa} = %{sameevr} Provides: bundled(rocksdb) -%description rocksdb-engine +%add_metadata rocksdb-engine + +%description -n %{pkgname}-rocksdb-engine The RocksDB storage engine is used for high performance servers on SSD drives. %endif %if %{with cracklib} -%package cracklib-password-check +%package -n %{pkgname}-cracklib-password-check Summary: The password strength checking plugin -Requires: %{name}-server%{?_isa} = %{sameevr} +Requires: %{pkgname}-server%{?_isa} = %{sameevr} BuildRequires: cracklib-dicts cracklib-devel Requires: cracklib-dicts @@ -500,7 +556,9 @@ Requires(post): (libselinux-utils if selinux-policy-targeted) Requires(post): (policycoreutils if selinux-policy-targeted) Requires(post): (policycoreutils-python-utils if selinux-policy-targeted) -%description cracklib-password-check +%add_metadata cracklib-password-check + +%description -n %{pkgname}-cracklib-password-check CrackLib is a password strength checking library. It is installed by default in many Linux distributions and is invoked automatically (by pam_cracklib.so) whenever the user login password is modified. @@ -510,86 +568,98 @@ also use it to check MariaDB account passwords. %if %{with gssapi} -%package gssapi-server +%package -n %{pkgname}-gssapi-server Summary: GSSAPI authentication plugin for server -Requires: %{name}-server%{?_isa} = %{sameevr} +Requires: %{pkgname}-server%{?_isa} = %{sameevr} BuildRequires: krb5-devel -%description gssapi-server +%add_metadata gssapi-server + +%description -n %{pkgname}-gssapi-server GSSAPI authentication server-side plugin for MariaDB for passwordless login. This plugin includes support for Kerberos on Unix. %endif %if %{with pam} -%package pam +%package -n %{pkgname}-pam Summary: PAM authentication plugin for the MariaDB server -Requires: %{name}-server%{?_isa} = %{sameevr} +Requires: %{pkgname}-server%{?_isa} = %{sameevr} # This subpackage NEED the 'mysql' user/group (created during mariadb-server %%pre) to be available prior installation -Requires(pre): %{name}-server%{?_isa} = %{sameevr} +Requires(pre): %{pkgname}-server%{?_isa} = %{sameevr} BuildRequires: pam-devel -%description pam +%add_metadata pam + +%description -n %{pkgname}-pam PAM authentication server-side plugin for MariaDB. %endif %if %{with sphinx} -%package sphinx-engine +%package -n %{pkgname}-sphinx-engine Summary: The Sphinx storage engine for MariaDB -Requires: %{name}-server%{?_isa} = %{sameevr} +Requires: %{pkgname}-server%{?_isa} = %{sameevr} BuildRequires: sphinx libsphinxclient libsphinxclient-devel Requires: sphinx libsphinxclient -%description sphinx-engine +%add_metadata sphinx-engine + +%description -n %{pkgname}-sphinx-engine The Sphinx storage engine for MariaDB. %endif %if %{with s3} -%package s3-engine +%package -n %{pkgname}-s3-engine Summary: The S3 storage engine for MariaDB -Requires: %{name}-server%{?_isa} = %{sameevr} +Requires: %{pkgname}-server%{?_isa} = %{sameevr} BuildRequires: curl-devel -%description s3-engine +%add_metadata s3-engine + +%description -n %{pkgname}-s3-engine The S3 read only storage engine allows archiving MariaDB tables in Amazon S3, or any third-party public or private cloud that implements S3 API, but still have them accessible for reading in MariaDB. %endif -%package server-utils +%package -n %{pkgname}-server-utils Summary: Non-essential server utilities for MariaDB/MySQL applications -Requires: %{name}-server%{?_isa} = %{sameevr} +Requires: %{pkgname}-server%{?_isa} = %{sameevr} # mysqlhotcopy needs DBI/DBD support Requires: perl(DBI) perl(DBD::MariaDB) +%add_metadata server-utils + %{?with_conflicts_mysql:Conflicts: mysql-server} %{?with_conflicts_community_mysql:Conflicts: community-mysql-server} -%description server-utils +%description -n %{pkgname}-server-utils This package contains all non-essential server utilities and scripts for managing databases. It also contains all utilities requiring Perl and it is the only MariaDB sub-package, except test subpackage, that depends on Perl. %if %{with devel} -%package devel +%package -n %{pkgname}-devel Summary: Files for development of MariaDB/MySQL applications -%{?with_clibrary:Requires: %{name}-libs%{?_isa} = %{sameevr}} +%{?with_clibrary:Requires: %{pkgname}-libs%{?_isa} = %{sameevr}} Requires: openssl-devel %if %{without clibrary} Requires: mariadb-connector-c-devel >= 3.0 %endif +%add_metadata devel + %{?with_conflicts_mysql:Conflicts: mysql-devel} %{?with_conflicts_community_mysql:Conflicts: community-mysql-devel} -%description devel +%description -n %{pkgname}-devel MariaDB is a multi-user, multi-threaded SQL database server. MariaDB is a community developed branch of MySQL. %if %{with clibrary} @@ -604,29 +674,33 @@ mariadb-connector-c package. %if %{with embedded} -%package embedded +%package -n %{pkgname}-embedded Summary: MariaDB as an embeddable library -Requires: %{name}-common = %{sameevr} -Requires: %{name}-errmsg = %{sameevr} +Requires: %{pkgname}-common = %{sameevr} +Requires: %{pkgname}-errmsg = %{sameevr} -%description embedded +%add_metadata embedded + +%description -n %{pkgname}-embedded MariaDB is a multi-user, multi-threaded SQL database server. This package contains a version of the MariaDB server that can be embedded into a client application instead of running as a separate process. MariaDB is a community developed fork from MySQL. -%package embedded-devel +%package -n %{pkgname}-embedded-devel Summary: Development files for MariaDB as an embeddable library -Requires: %{name}-embedded%{?_isa} = %{sameevr} -Requires: %{name}-devel%{?_isa} = %{sameevr} +Requires: %{pkgname}-embedded%{?_isa} = %{sameevr} +Requires: %{pkgname}-devel%{?_isa} = %{sameevr} # embedded-devel should require libaio-devel (rhbz#1290517) Requires: libaio-devel +%add_metadata embedded-devel + %{?with_conflicts_mysql:Conflicts: mysql-embedded-devel} %{?with_conflicts_community_mysql:Conflicts: community-mysql-embedded-devel} -%description embedded-devel +%description -n %{pkgname}-embedded-devel MariaDB is a multi-user, multi-threaded SQL database server. MariaDB is a community developed fork from MySQL. This package contains files needed for developing and testing with @@ -635,11 +709,11 @@ the embedded version of the MariaDB server. %if %{with test} -%package test +%package -n %{pkgname}-test Summary: The test suite distributed with MariaDB -Requires: %{name}%{?_isa} = %{sameevr} -Requires: %{name}-common = %{sameevr} -Requires: %{name}-server%{?_isa} = %{sameevr} +Requires: %{pkgname}%{?_isa} = %{sameevr} +Requires: %{pkgname}-common = %{sameevr} +Requires: %{pkgname}-server%{?_isa} = %{sameevr} Requires: patch Requires: perl(Env) Requires: perl(Exporter) @@ -653,10 +727,12 @@ Requires: perl(Sys::Hostname) Requires: perl(Test::More) Requires: perl(Time::HiRes) +%add_metadata test + %{?with_conflicts_mysql:Conflicts: mysql-test} %{?with_conflicts_community_mysql:Conflicts: community-mysql-test} -%description test +%description -n %{pkgname}-test MariaDB is a multi-user, multi-threaded SQL database server. MariaDB is a community developed fork from MySQL. This package contains the regression test suite distributed with the MariaDB @@ -676,7 +752,6 @@ rm -r storage/rocksdb/ %endif - %patch -P4 -p1 %patch -P7 -p1 %patch -P9 -p1 @@ -1208,22 +1283,22 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 )) -%pre server +%pre -n %{pkgname}-server /usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || : /usr/sbin/useradd -M -N -g mysql -o -r -d %{dbdatadir} -s /sbin/nologin \ -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || : -%post server +%post -n %{pkgname}-server %systemd_post %{daemon_name}.service -%preun server +%preun -n %{pkgname}-server %systemd_preun %{daemon_name}.service -%postun server +%postun -n %{pkgname}-server %systemd_postun_with_restart %{daemon_name}.service %if %{with galera} -%post server-galera +%post -n %{pkgname}-server-galera %selinux_modules_install -s "targeted" %{_datadir}/selinux/packages/targeted/%{pkg_name}-server-galera.pp # Allow ports needed for the replication: @@ -1239,7 +1314,7 @@ if [ $1 -eq 1 ]; then semanage port -a -t mysqld_port_t -p tcp 4444 >/dev/null 2>&1 || : fi -%postun server-galera +%postun -n %{pkgname}-server-galera if [ $1 -eq 0 ]; then %selinux_modules_uninstall -s "targeted" %{pkg_name}-server-galera @@ -1253,10 +1328,10 @@ fi %endif %if %{with cracklib} -%post cracklib-password-check +%post -n %{pkgname}-cracklib-password-check %selinux_modules_install -s "targeted" %{_datadir}/selinux/packages/targeted/%{pkg_name}-plugin-cracklib-password-check.pp -%postun cracklib-password-check +%postun -n %{pkgname}-cracklib-password-check if [ $1 -eq 0 ]; then %selinux_modules_uninstall -s "targeted" %{pkg_name}-plugin-cracklib-password-check fi @@ -1265,7 +1340,7 @@ fi %if %{with client} -%files +%files -n %{pkgname} %{_bindir}/msql2mysql %{_bindir}/{mysql,mariadb} %{_bindir}/mysql{access,admin,binlog,check,dump,_find_rows,import,_plugin,show,slap,_waitpid} @@ -1280,14 +1355,14 @@ fi %endif %if %{with clibrary} -%files libs +%files -n %{pkgname}-libs %exclude %{_libdir}/{libmysqlclient.so.18,libmariadb.so,libmysqlclient.so,libmysqlclient_r.so} %{_libdir}/libmariadb.so* %config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf %endif %if %{with config} -%files config +%files -n %{pkgname}-config # although the default my.cnf contains only server settings, we put it in the # common package because it can be used for client settings too. %dir %{_sysconfdir}/my.cnf.d @@ -1295,7 +1370,7 @@ fi %endif %if %{with common} -%files common +%files -n %{pkgname}-common %doc %{_datadir}/doc/%{pkg_name} %dir %{_datadir}/%{pkg_name} %{_datadir}/%{pkg_name}/charsets @@ -1306,7 +1381,7 @@ fi %endif %if %{with errmsg} -%files errmsg +%files -n %{pkgname}-errmsg %{_datadir}/%{pkg_name}/errmsg-utf8.txt %{_datadir}/%{pkg_name}/english %lang(cs) %{_datadir}/%{pkg_name}/czech @@ -1338,7 +1413,7 @@ fi %endif %if %{with galera} -%files server-galera +%files -n %{pkgname}-server-galera %doc Docs/README-wsrep %license LICENSE.clustercheck %{_bindir}/clustercheck @@ -1349,7 +1424,7 @@ fi %{_datadir}/selinux/packages/targeted/%{pkg_name}-server-galera.pp %endif -%files server +%files -n %{pkgname}-server %{_bindir}/aria_{chk,dump_log,ftdump,pack,read_log} %{_bindir}/mariadb-service-convert @@ -1498,14 +1573,14 @@ fi %{_sysusersdir}/%{pkg_name}.conf %if %{with cracklib} -%files cracklib-password-check +%files -n %{pkgname}-cracklib-password-check %config(noreplace) %{_sysconfdir}/my.cnf.d/cracklib_password_check.cnf %{_libdir}/%{pkg_name}/plugin/cracklib_password_check.so %{_datadir}/selinux/packages/targeted/%{pkg_name}-plugin-cracklib-password-check.pp %endif %if %{with backup} -%files backup +%files -n %{pkgname}-backup %{_bindir}/maria{,db-}backup %{_bindir}/mbstream %{_mandir}/man1/maria{,db-}backup.1* @@ -1513,7 +1588,7 @@ fi %endif %if %{with rocksdb} -%files rocksdb-engine +%files -n %{pkgname}-rocksdb-engine %config(noreplace) %{_sysconfdir}/my.cnf.d/rocksdb.cnf %{_bindir}/myrocks_hotbackup %{_bindir}/{mysql_,mariadb-}ldb @@ -1524,13 +1599,13 @@ fi %endif %if %{with gssapi} -%files gssapi-server +%files -n %{pkgname}-gssapi-server %{_libdir}/%{pkg_name}/plugin/auth_gssapi.so %config(noreplace) %{_sysconfdir}/my.cnf.d/auth_gssapi.cnf %endif %if %{with pam} -%files pam +%files -n %{pkgname}-pam %{_libdir}/%{pkg_name}/plugin/{auth_pam_v1.so,auth_pam.so} %attr(0755,root,root) %dir %{_libdir}/%{pkg_name}/plugin/auth_pam_tool_dir # SUID-to-root binary. Access MUST be restricted (https://jira.mariadb.org/browse/MDEV-25126) @@ -1540,31 +1615,31 @@ fi %endif %if %{with sphinx} -%files sphinx-engine +%files -n %{pkgname}-sphinx-engine %{_libdir}/%{pkg_name}/plugin/ha_sphinx.so %endif %if %{with oqgraph} -%files oqgraph-engine +%files -n %{pkgname}-oqgraph-engine %config(noreplace) %{_sysconfdir}/my.cnf.d/oqgraph.cnf %{_libdir}/%{pkg_name}/plugin/ha_oqgraph.so %endif %if %{with connect} -%files connect-engine +%files -n %{pkgname}-connect-engine %config(noreplace) %{_sysconfdir}/my.cnf.d/connect.cnf %{_libdir}/%{pkg_name}/plugin/ha_connect.so %endif %if %{with s3} -%files s3-engine +%files -n %{pkgname}-s3-engine %{_bindir}/aria_s3_copy %{_mandir}/man1/aria_s3_copy.1* %config(noreplace) %{_sysconfdir}/my.cnf.d/s3.cnf %{_libdir}/%{pkg_name}/plugin/ha_s3.so %endif -%files server-utils +%files -n %{pkgname}-server-utils # Perl utilities %{_bindir}/mysql{_convert_table_format,dumpslow,_fix_extensions,hotcopy,_setpermission} %{_bindir}/mariadb-{convert-table-format,dumpslow,fix-extensions,hotcopy,setpermission} @@ -1580,7 +1655,7 @@ fi %{_mandir}/man1/perror.1* %if %{with devel} -%files devel +%files -n %{pkgname}-devel %{_includedir}/* %{_datadir}/aclocal/mysql.m4 %{_libdir}/pkgconfig/*mariadb.pc @@ -1598,16 +1673,16 @@ fi %endif %if %{with embedded} -%files embedded +%files -n %{pkgname}-embedded %{_libdir}/libmariadbd.so.* -%files embedded-devel +%files -n %{pkgname}-embedded-devel %{_libdir}/libmysqld.so %{_libdir}/libmariadbd.so %endif %if %{with test} -%files test +%files -n %{pkgname}-test %if %{with embedded} %{_bindir}/test-connect-t %{_bindir}/{mysql_client_test_embedded,mysqltest_embedded} @@ -1625,6 +1700,11 @@ fi %endif %changelog +* Wed Jan 31 2024 Filip Janus - 3:10.11.6-2 +- Apply demodularization +- the default stream builds mariadb.rpm +- the non-default stream builds mariadbXX.XX.rpm + * Thu Jan 25 2024 Michal Schorm - 3:10.11.6-1 - Rebase to 10.11.6 diff --git a/sources b/sources old mode 100644 new mode 100755