diff --git a/mariadb.spec b/mariadb.spec index 18e5cd4..d1073b4 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -5,8 +5,8 @@ %define userid 65018 Name: mariadb -Version: 10.6.4 -Release: 1mamba +Version: 10.8.2 +Release: 2mamba Summary: A SQL database engine designed as a drop-in replacement of MySQL(R) Group: Applications/Databases Vendor: openmamba @@ -156,6 +156,7 @@ cd libmariadb %patch1 -p1 -R %build +#:<< _EOF %cmake -d build \ -DBUILD_CONFIG=mysql_release \ -DSYSCONFDIR=%{_sysconfdir}/mysql \ @@ -166,7 +167,9 @@ cd libmariadb -DDEFAULT_COLLATION=utf8_general_ci \ -DENABLED_LOCAL_INFILE=ON \ -DINSTALL_INFODIR=share/mysql/docs \ + -DINSTALL_LIBDIR=%{_lib} \ -DINSTALL_MANDIR=share/man \ + -DINSTALL_PCDIR=%{_libdir}/pkgconfig \ -DINSTALL_PLUGINDIR=%{_lib}/mysql/plugin \ -DINSTALL_SCRIPTDIR=bin \ -DINSTALL_INCLUDEDIR=include/mysql \ @@ -237,11 +240,6 @@ install -D -m644 support-files/rpm/mysql-clients.cnf %{buildroot}%{_sysconfdir}/ ln -s libmariadb.so.3 %{buildroot}%{_libdir}/libmysqlclient.so.18 -%ifarch x86_64 aarch64 -mv %{buildroot}%{_prefix}/lib/lib* %{buildroot}%{_libdir}/ -mv %{buildroot}%{_prefix}/lib/pkgconfig %{buildroot}%{_libdir} -%endif - install -d -m0755 %{buildroot}%{_sysconfdir}/php/php.d cat > %{buildroot}%{_sysconfdir}/php/php.d/mysql_mariadb.ini << _EOF [MySQL] @@ -562,10 +560,7 @@ fi %{_datadir}/mysql/INSTALL-BINARY %{_datadir}/mysql/README.md %{_datadir}/mysql/hindi -%dir %{_datadir}/groonga -%{_datadir}/groonga/* -%dir %{_datadir}/groonga-normalizer-mysql -%{_datadir}/groonga-normalizer-mysql/* +%{_datadir}/mysql/mini-benchmark %dir %{_datadir}/mysql/mroonga %{_datadir}/mysql/mroonga/* %dir %{_datadir}/mysql/aclocal @@ -575,11 +570,10 @@ fi %dir %{_datadir}/mysql/systemd %{_datadir}/mysql/systemd/* %{_datadir}/mysql/wsrep_notify -#%ifarch x86_64 -#%dir %{_datadir}/mysql/docs -#%{_datadir}/mysql/docs/* -#%endif -#%{_datadir}/mysql/mysql_performance_tables.sql +%dir %{_datadir}/groonga +%{_datadir}/groonga/* +%dir %{_datadir}/groonga-normalizer-mysql +%{_datadir}/groonga-normalizer-mysql/* %{_mandir}/man1/innochecksum.1* %{_mandir}/man1/my_print_defaults.1* %{_mandir}/man1/myisamchk.1* @@ -633,6 +627,7 @@ fi %dir %{_includedir}/mysql %{_includedir}/mysql/* %{_libdir}/libmariadb.so +%{_libdir}/libmariadb.a %{_libdir}/libmariadbclient.a %{_libdir}/libmariadbd.a %{_libdir}/libmariadbd.so @@ -652,6 +647,18 @@ fi %{_mandir}/man3/mysql_*.3* %changelog +* Wed May 04 2022 Silvan Calarco 10.8.2-2mamba +- fix pkgconifg file providing -DINSTALL_LIBDIR=%{_lib} + +* Fri Feb 25 2022 Automatic Build System 10.8.2-1mamba +- automatic version update by autodist + +* Tue Nov 16 2021 Automatic Build System 10.7.1-1mamba +- automatic version update by autodist + +* Mon Nov 15 2021 Automatic Build System 10.6.5-1mamba +- automatic version update by autodist + * Fri Aug 06 2021 Automatic Build System 10.6.4-1mamba - automatic version update by autodist