diff --git a/greatsql.spec b/greatsql.spec index f1b50b874acb4b8fe9066189137f7c0e61b938ea..067d359dc4dc136da3b1acc8f076fdffab7ba065 100644 --- a/greatsql.spec +++ b/greatsql.spec @@ -32,7 +32,7 @@ %global greatsql_version 25 %global revision db07cc5cb73 %global tokudb_backup_version %{mysql_version}-%{greatsql_version} -%global rpm_release 1 +%global rpm_release 2 %global release %{greatsql_version}.%{rpm_release}%{?dist} @@ -165,9 +165,8 @@ BuildRequires: ncurses-devel BuildRequires: pam-devel BuildRequires: readline-devel BuildRequires: numactl-devel -BuildRequires: compat-openssl11-devel -#BuildRequires: openssl -#BuildRequires: openssl-devel +BuildRequires: openssl +BuildRequires: openssl-devel BuildRequires: zlib-devel BuildRequires: bison BuildRequires: openldap-devel @@ -213,8 +212,7 @@ Requires: net-tools Requires(pre): greatsql-shared Requires: greatsql-client Requires: greatsql-icu-data-files -Requires: compat-openssl11-devel -#Requires: openssl +Requires: openssl Conflicts: Percona-SQL-server-50 Percona-Server-server-51 Percona-Server-server-55 Percona-Server-server-56 Percona-Server-server-57 %if 0%{?systemd} @@ -790,13 +788,13 @@ fi %attr(644, root, root) %{_mandir}/man1/myisamlog.1* %attr(644, root, root) %{_mandir}/man1/myisampack.1* %attr(644, root, root) %{_mandir}/man8/mysqld.8* -%if 0%{?systemd} -%exclude %{_mandir}/man1/mysqld_multi.1* -%exclude %{_mandir}/man1/mysqld_safe.1* -%else -%attr(644, root, root) %{_mandir}/man1/mysqld_multi.1* -%attr(644, root, root) %{_mandir}/man1/mysqld_safe.1* -%endif +#%if 0%{?systemd} +#%exclude %{_mandir}/man1/mysqld_multi.1* +#%exclude %{_mandir}/man1/mysqld_safe.1* +#%else +#%attr(644, root, root) %{_mandir}/man1/mysqld_multi.1* +#%attr(644, root, root) %{_mandir}/man1/mysqld_safe.1* +#%endif %attr(644, root, root) %{_mandir}/man1/mysqldumpslow.1* %attr(644, root, root) %{_mandir}/man1/mysql_secure_installation.1* %attr(644, root, root) %{_mandir}/man1/mysql_upgrade.1* @@ -893,7 +891,7 @@ fi %attr(755, root, root) %{_libdir}/mysql/plugin/component_reference_cache.so %attr(755, root, root) %{_libdir}/mysql/plugin/test_services_command_services.so #%attr(755, root, root) %{_libdir}/mysql/plugin/tokudb_backup.so -%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_kerberos_client.so +#%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_kerberos_client.so %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_ldap_sasl.so %attr(755, root, root) %{_libdir}/mysql/plugin/authentication_oci_client.so %attr(755, root, root) %{_libdir}/mysql/plugin/component_encryption_udf.so @@ -951,7 +949,7 @@ fi %attr(755, root, root) %{_libdir}/mysql/plugin/debug/libtest_sql_sleep_is_connected.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/test_udf_wrappers.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_reference_cache.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_kerberos_client.so +#%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_kerberos_client.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_ldap_sasl.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_oci_client.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/component_encryption_udf.so @@ -1352,16 +1350,19 @@ fi %changelog +* Fri Jun 7 2024 GreatSQL - 8.0.32-25.2 +- Change the compilation dependency of compat-openssl to openssl for GreatSQL-8.0.32-25.2 + * Thu Dec 28 2023 GreatSQL - 8.0.32-25.1 - Release GreatSQL-8.0.32-25.1 -* Wed Jul 5 2023 GreatSQL - 8.0.32-24.2 +* Wed Jul 5 2023 GreatSQL - 8.0.32-24.2 - modify libmysqlrouter.so.* to libmysqlrouter*.so.* -* Wed Jun 7 2023 GreatSQL - 8.0.32-24.1 +* Wed Jun 7 2023 GreatSQL - 8.0.32-24.1 - Release GreatSQL-8.0.32-24.1 for openEuler -* Mon Feb 6 2023 GreatSQL - 8.0.25-16.6 +* Mon Feb 6 2023 GreatSQL - 8.0.25-16.6 - compat-openssl11-devel * Tue Sep 13 2022 bzhaoop - 8.0.25-16.5 @@ -1377,7 +1378,7 @@ fi * Tue Aug 9 2022 bzhaoop - 8.0.25-16.2 - Hide the conflict libs and files. -* Wed Jun 6 2022 GreatSQL - 8.0.25-16.1 +* Mon Jun 6 2022 GreatSQL - 8.0.25-16.1 - Release GreatSQL-8.0.25-16.1 for openEuler * Mon Apr 25 2022 GreatSQL - 8.0.25-15.1