diff --git a/mysql.rpmlintrc b/mysql8.4.rpmlintrc similarity index 100% rename from mysql.rpmlintrc rename to mysql8.4.rpmlintrc diff --git a/mysql8.4.spec b/mysql8.4.spec index d342d2e..effcda3 100644 --- a/mysql8.4.spec +++ b/mysql8.4.spec @@ -104,7 +104,7 @@ ExcludeArch: %{ix86} Name: %{majorname}%{majorversion} Version: %{package_version} -Release: 1%{?with_debug:.debug}%{?dist} +Release: 2%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -125,7 +125,7 @@ Source15: mysql-scripts-common.sh Source17: mysql-wait-stop.sh Source18: mysql@.service.in # To track rpmlint warnings -Source30: %{pkgnamepatch}.rpmlintrc +Source30: %{name}.rpmlintrc # Configuration for server Source31: server.cnf.in # Skipped tests lists @@ -402,6 +402,8 @@ Requires(post): policycoreutils-python-utils Requires: (mysql-selinux if selinux-policy-targeted) %endif +Suggests: logrotate + %{?with_conflicts_mariadb:Conflicts: mariadb-server} %{?with_conflicts_mariadb:Conflicts: mariadb-server-utils} %{?with_conflicts_mariadb:Conflicts: mariadb-server-galera} @@ -728,7 +730,7 @@ mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,my_print_defaults}.1* %if %{with config} mkdir -p %{buildroot}%{_sysconfdir}/my.cnf.d %else -#rm %{buildroot}%{_sysconfdir}/my.cnf +#rm %%{buildroot}%%{_sysconfdir}/my.cnf %endif %if ! %{with common} @@ -1019,7 +1021,7 @@ fi %{_bindir}/mysqlxtest %dir %attr(-,mysql,mysql) %{_datadir}/mysql-test -%{_datadir}/mysql-test/%{skiplist} +%attr(-,mysql,mysql) %{_datadir}/mysql-test/%{skiplist} %dir %{_libdir}/mysql %dir %{_libdir}/mysql/plugin