From f45638f43a9dcfc7829fca4e32e2b0fd7e84319b Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Mon, 1 Feb 2021 01:33:17 +0100 Subject: [PATCH] Remove README.mysql-cnf The example configuration files, located in "/usr/share/mariadb/", named "*.cnf" were dropped in MariaDB 10.3 and we haven't shipped them since --- README.mysql-cnf | 13 ------------- mariadb.spec | 3 --- 2 files changed, 16 deletions(-) delete mode 100644 README.mysql-cnf diff --git a/README.mysql-cnf b/README.mysql-cnf deleted file mode 100644 index 3700c7f..0000000 --- a/README.mysql-cnf +++ /dev/null @@ -1,13 +0,0 @@ -This directory contains prepared configuration files with .cnf extension, -which provide a configuration for some common MariaDB deployment scenarios. -These configuration files do not include the default configuration of datadir, -log-file and pid-file locations, as specified in the default my.cnf file, -provided in this distribution. - -Thus, it is recommended to use these configuration files as an addition to the -default my.cnf configuration file. - -Since default my.cnf contains `!includedir @INSTALL_SYSCONF2DIR@` directive, it is -recommended to copy required configuration under @INSTALL_SYSCONF2DIR@ directory, -so the default my.cnf specifications will be extended. - diff --git a/mariadb.spec b/mariadb.spec index 815d41a..5c108f1 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -165,7 +165,6 @@ License: GPLv2 with exceptions and LGPLv2 and BSD Source0: https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz Source2: mysql_config_multilib.sh Source3: my.cnf.in -Source5: README.mysql-cnf Source6: README.mysql-docs Source7: README.mysql-license Source10: mysql.tmpfiles.d.in @@ -1023,7 +1022,6 @@ ln -s %{_libexecdir}/mysqld %{buildroot}%{_sbindir}/mysqld ln -s %{_libexecdir}/mariadbd %{buildroot}%{_sbindir}/mariadbd # copy additional docs into build tree so %%doc will find them -install -p -m 0644 %{SOURCE5} %{basename:%{SOURCE5}} install -p -m 0644 %{SOURCE6} %{basename:%{SOURCE6}} install -p -m 0644 %{SOURCE7} %{basename:%{SOURCE7}} install -p -m 0644 %{SOURCE16} %{basename:%{SOURCE16}} @@ -1378,7 +1376,6 @@ fi %endif %files server -%doc README.mysql-cnf %{_bindir}/aria_{chk,dump_log,ftdump,pack,read_log} %{_bindir}/mariadb-service-convert